diff options
-rw-r--r-- | deploy/flake.lock | 24 | ||||
-rw-r--r-- | flake.lock | 24 | ||||
-rw-r--r-- | flakes/flake.lock | 22 | ||||
-rw-r--r-- | flakes/private/monitoring/myplugins.nix | 44 | ||||
-rw-r--r-- | systems/backup-2/flake.lock | 2 | ||||
-rw-r--r-- | systems/dilion/flake.lock | 2 | ||||
-rw-r--r-- | systems/eldiron/flake.lock | 2 | ||||
-rw-r--r-- | systems/monitoring-1/flake.lock | 2 | ||||
-rw-r--r-- | systems/monitoring-1/monitoring-master.nix | 1 | ||||
-rw-r--r-- | systems/monitoring-1/monitoring/Dockerfile | 10 | ||||
-rw-r--r-- | systems/quatresaisons/flake.lock | 2 |
11 files changed, 73 insertions, 62 deletions
diff --git a/deploy/flake.lock b/deploy/flake.lock index 6c3e517..ea59700 100644 --- a/deploy/flake.lock +++ b/deploy/flake.lock | |||
@@ -2848,7 +2848,7 @@ | |||
2848 | }, | 2848 | }, |
2849 | "locked": { | 2849 | "locked": { |
2850 | "lastModified": 1, | 2850 | "lastModified": 1, |
2851 | "narHash": "sha256-sLwKmVmedkPJkkDRn3bWtQqsGAM6UdqVpHtfB5oQJ84=", | 2851 | "narHash": "sha256-unN29OjKjdudbGVbp0ZDzRVsWch30x0zAmqtOn+6/OA=", |
2852 | "path": "../flakes", | 2852 | "path": "../flakes", |
2853 | "type": "path" | 2853 | "type": "path" |
2854 | }, | 2854 | }, |
@@ -2959,7 +2959,7 @@ | |||
2959 | }, | 2959 | }, |
2960 | "locked": { | 2960 | "locked": { |
2961 | "lastModified": 1, | 2961 | "lastModified": 1, |
2962 | "narHash": "sha256-JoRDMcdd3yCwmMTcntzqPOEKRuubert3/1S1hLHIwbg=", | 2962 | "narHash": "sha256-UtTwF1ni+Qy4n65KjH2WLtb263VIf7fnvVWExxSMR6U=", |
2963 | "path": "../../flakes/private/monitoring", | 2963 | "path": "../../flakes/private/monitoring", |
2964 | "type": "path" | 2964 | "type": "path" |
2965 | }, | 2965 | }, |
@@ -2977,7 +2977,7 @@ | |||
2977 | }, | 2977 | }, |
2978 | "locked": { | 2978 | "locked": { |
2979 | "lastModified": 1, | 2979 | "lastModified": 1, |
2980 | "narHash": "sha256-JoRDMcdd3yCwmMTcntzqPOEKRuubert3/1S1hLHIwbg=", | 2980 | "narHash": "sha256-UtTwF1ni+Qy4n65KjH2WLtb263VIf7fnvVWExxSMR6U=", |
2981 | "path": "../../flakes/private/monitoring", | 2981 | "path": "../../flakes/private/monitoring", |
2982 | "type": "path" | 2982 | "type": "path" |
2983 | }, | 2983 | }, |
@@ -2995,7 +2995,7 @@ | |||
2995 | }, | 2995 | }, |
2996 | "locked": { | 2996 | "locked": { |
2997 | "lastModified": 1, | 2997 | "lastModified": 1, |
2998 | "narHash": "sha256-JoRDMcdd3yCwmMTcntzqPOEKRuubert3/1S1hLHIwbg=", | 2998 | "narHash": "sha256-UtTwF1ni+Qy4n65KjH2WLtb263VIf7fnvVWExxSMR6U=", |
2999 | "path": "../../flakes/private/monitoring", | 2999 | "path": "../../flakes/private/monitoring", |
3000 | "type": "path" | 3000 | "type": "path" |
3001 | }, | 3001 | }, |
@@ -3013,7 +3013,7 @@ | |||
3013 | }, | 3013 | }, |
3014 | "locked": { | 3014 | "locked": { |
3015 | "lastModified": 1, | 3015 | "lastModified": 1, |
3016 | "narHash": "sha256-JoRDMcdd3yCwmMTcntzqPOEKRuubert3/1S1hLHIwbg=", | 3016 | "narHash": "sha256-UtTwF1ni+Qy4n65KjH2WLtb263VIf7fnvVWExxSMR6U=", |
3017 | "path": "../../flakes/private/monitoring", | 3017 | "path": "../../flakes/private/monitoring", |
3018 | "type": "path" | 3018 | "type": "path" |
3019 | }, | 3019 | }, |
@@ -3898,7 +3898,7 @@ | |||
3898 | }, | 3898 | }, |
3899 | "locked": { | 3899 | "locked": { |
3900 | "lastModified": 1, | 3900 | "lastModified": 1, |
3901 | "narHash": "sha256-dcGCP4uE6vafVgQ65G5W8iSBYvfCZSJnyH5jD3b2fr0=", | 3901 | "narHash": "sha256-jYDd12hVtZ0RjPzp/xM3qmi7FXPPBykqwd6vwrgwf4c=", |
3902 | "path": "../systems/backup-2", | 3902 | "path": "../systems/backup-2", |
3903 | "type": "path" | 3903 | "type": "path" |
3904 | }, | 3904 | }, |
@@ -3921,7 +3921,7 @@ | |||
3921 | }, | 3921 | }, |
3922 | "locked": { | 3922 | "locked": { |
3923 | "lastModified": 1, | 3923 | "lastModified": 1, |
3924 | "narHash": "sha256-2NsoEf/geroWa/Ja3KXjWJ/fwtu4oPIHghKTbePvcUM=", | 3924 | "narHash": "sha256-Auu8c8lLeB6+qvZrv+KxdguCN4sjSDwI/FNoSx6Aoj0=", |
3925 | "path": "../systems/dilion", | 3925 | "path": "../systems/dilion", |
3926 | "type": "path" | 3926 | "type": "path" |
3927 | }, | 3927 | }, |
@@ -3970,7 +3970,7 @@ | |||
3970 | }, | 3970 | }, |
3971 | "locked": { | 3971 | "locked": { |
3972 | "lastModified": 1, | 3972 | "lastModified": 1, |
3973 | "narHash": "sha256-mO4nIxuAllmkJETKABkF/l2+FgPOXfPZn2A1pgY/Cq0=", | 3973 | "narHash": "sha256-v+ViigN/4JW/nivZkfWgcOzlIN1obZ3yq+0BOf0rA5Q=", |
3974 | "path": "../systems/eldiron", | 3974 | "path": "../systems/eldiron", |
3975 | "type": "path" | 3975 | "type": "path" |
3976 | }, | 3976 | }, |
@@ -3996,7 +3996,7 @@ | |||
3996 | }, | 3996 | }, |
3997 | "locked": { | 3997 | "locked": { |
3998 | "lastModified": 1, | 3998 | "lastModified": 1, |
3999 | "narHash": "sha256-VJIMYLlvdSRrH+7fNxxblLTu44rvTLmP6YfeGg0/D4g=", | 3999 | "narHash": "sha256-rQTnAiIRXzIVEORZtQ5olYOCUyZMX8E7pB5CtwNsLT8=", |
4000 | "path": "../systems/monitoring-1", | 4000 | "path": "../systems/monitoring-1", |
4001 | "type": "path" | 4001 | "type": "path" |
4002 | }, | 4002 | }, |
@@ -4021,7 +4021,7 @@ | |||
4021 | }, | 4021 | }, |
4022 | "locked": { | 4022 | "locked": { |
4023 | "lastModified": 1, | 4023 | "lastModified": 1, |
4024 | "narHash": "sha256-KLvAqCYrbObYWyUnUzMHUKo0FIt5DO/g7AuAbGrYaYs=", | 4024 | "narHash": "sha256-Y8fj3YZOTJBzRyyCQWP2FJFSSucwMSqWp15xj4wq9wo=", |
4025 | "path": "../systems/quatresaisons", | 4025 | "path": "../systems/quatresaisons", |
4026 | "type": "path" | 4026 | "type": "path" |
4027 | }, | 4027 | }, |
@@ -7641,7 +7641,7 @@ | |||
7641 | }, | 7641 | }, |
7642 | "locked": { | 7642 | "locked": { |
7643 | "lastModified": 1, | 7643 | "lastModified": 1, |
7644 | "narHash": "sha256-JoRDMcdd3yCwmMTcntzqPOEKRuubert3/1S1hLHIwbg=", | 7644 | "narHash": "sha256-UtTwF1ni+Qy4n65KjH2WLtb263VIf7fnvVWExxSMR6U=", |
7645 | "path": "../../flakes/private/monitoring", | 7645 | "path": "../../flakes/private/monitoring", |
7646 | "type": "path" | 7646 | "type": "path" |
7647 | }, | 7647 | }, |
@@ -8528,7 +8528,7 @@ | |||
8528 | }, | 8528 | }, |
8529 | "locked": { | 8529 | "locked": { |
8530 | "lastModified": 1, | 8530 | "lastModified": 1, |
8531 | "narHash": "sha256-JoRDMcdd3yCwmMTcntzqPOEKRuubert3/1S1hLHIwbg=", | 8531 | "narHash": "sha256-UtTwF1ni+Qy4n65KjH2WLtb263VIf7fnvVWExxSMR6U=", |
8532 | "path": "./private/monitoring", | 8532 | "path": "./private/monitoring", |
8533 | "type": "path" | 8533 | "type": "path" |
8534 | }, | 8534 | }, |
@@ -2729,7 +2729,7 @@ | |||
2729 | }, | 2729 | }, |
2730 | "locked": { | 2730 | "locked": { |
2731 | "lastModified": 1, | 2731 | "lastModified": 1, |
2732 | "narHash": "sha256-sLwKmVmedkPJkkDRn3bWtQqsGAM6UdqVpHtfB5oQJ84=", | 2732 | "narHash": "sha256-unN29OjKjdudbGVbp0ZDzRVsWch30x0zAmqtOn+6/OA=", |
2733 | "path": "./flakes", | 2733 | "path": "./flakes", |
2734 | "type": "path" | 2734 | "type": "path" |
2735 | }, | 2735 | }, |
@@ -2975,7 +2975,7 @@ | |||
2975 | }, | 2975 | }, |
2976 | "locked": { | 2976 | "locked": { |
2977 | "lastModified": 1, | 2977 | "lastModified": 1, |
2978 | "narHash": "sha256-JoRDMcdd3yCwmMTcntzqPOEKRuubert3/1S1hLHIwbg=", | 2978 | "narHash": "sha256-UtTwF1ni+Qy4n65KjH2WLtb263VIf7fnvVWExxSMR6U=", |
2979 | "path": "../../flakes/private/monitoring", | 2979 | "path": "../../flakes/private/monitoring", |
2980 | "type": "path" | 2980 | "type": "path" |
2981 | }, | 2981 | }, |
@@ -2993,7 +2993,7 @@ | |||
2993 | }, | 2993 | }, |
2994 | "locked": { | 2994 | "locked": { |
2995 | "lastModified": 1, | 2995 | "lastModified": 1, |
2996 | "narHash": "sha256-JoRDMcdd3yCwmMTcntzqPOEKRuubert3/1S1hLHIwbg=", | 2996 | "narHash": "sha256-UtTwF1ni+Qy4n65KjH2WLtb263VIf7fnvVWExxSMR6U=", |
2997 | "path": "../../flakes/private/monitoring", | 2997 | "path": "../../flakes/private/monitoring", |
2998 | "type": "path" | 2998 | "type": "path" |
2999 | }, | 2999 | }, |
@@ -3011,7 +3011,7 @@ | |||
3011 | }, | 3011 | }, |
3012 | "locked": { | 3012 | "locked": { |
3013 | "lastModified": 1, | 3013 | "lastModified": 1, |
3014 | "narHash": "sha256-JoRDMcdd3yCwmMTcntzqPOEKRuubert3/1S1hLHIwbg=", | 3014 | "narHash": "sha256-UtTwF1ni+Qy4n65KjH2WLtb263VIf7fnvVWExxSMR6U=", |
3015 | "path": "../../flakes/private/monitoring", | 3015 | "path": "../../flakes/private/monitoring", |
3016 | "type": "path" | 3016 | "type": "path" |
3017 | }, | 3017 | }, |
@@ -3029,7 +3029,7 @@ | |||
3029 | }, | 3029 | }, |
3030 | "locked": { | 3030 | "locked": { |
3031 | "lastModified": 1, | 3031 | "lastModified": 1, |
3032 | "narHash": "sha256-JoRDMcdd3yCwmMTcntzqPOEKRuubert3/1S1hLHIwbg=", | 3032 | "narHash": "sha256-UtTwF1ni+Qy4n65KjH2WLtb263VIf7fnvVWExxSMR6U=", |
3033 | "path": "../../flakes/private/monitoring", | 3033 | "path": "../../flakes/private/monitoring", |
3034 | "type": "path" | 3034 | "type": "path" |
3035 | }, | 3035 | }, |
@@ -3914,7 +3914,7 @@ | |||
3914 | }, | 3914 | }, |
3915 | "locked": { | 3915 | "locked": { |
3916 | "lastModified": 1, | 3916 | "lastModified": 1, |
3917 | "narHash": "sha256-dcGCP4uE6vafVgQ65G5W8iSBYvfCZSJnyH5jD3b2fr0=", | 3917 | "narHash": "sha256-jYDd12hVtZ0RjPzp/xM3qmi7FXPPBykqwd6vwrgwf4c=", |
3918 | "path": "../systems/backup-2", | 3918 | "path": "../systems/backup-2", |
3919 | "type": "path" | 3919 | "type": "path" |
3920 | }, | 3920 | }, |
@@ -3937,7 +3937,7 @@ | |||
3937 | }, | 3937 | }, |
3938 | "locked": { | 3938 | "locked": { |
3939 | "lastModified": 1, | 3939 | "lastModified": 1, |
3940 | "narHash": "sha256-2NsoEf/geroWa/Ja3KXjWJ/fwtu4oPIHghKTbePvcUM=", | 3940 | "narHash": "sha256-Auu8c8lLeB6+qvZrv+KxdguCN4sjSDwI/FNoSx6Aoj0=", |
3941 | "path": "../systems/dilion", | 3941 | "path": "../systems/dilion", |
3942 | "type": "path" | 3942 | "type": "path" |
3943 | }, | 3943 | }, |
@@ -3986,7 +3986,7 @@ | |||
3986 | }, | 3986 | }, |
3987 | "locked": { | 3987 | "locked": { |
3988 | "lastModified": 1, | 3988 | "lastModified": 1, |
3989 | "narHash": "sha256-mO4nIxuAllmkJETKABkF/l2+FgPOXfPZn2A1pgY/Cq0=", | 3989 | "narHash": "sha256-v+ViigN/4JW/nivZkfWgcOzlIN1obZ3yq+0BOf0rA5Q=", |
3990 | "path": "../systems/eldiron", | 3990 | "path": "../systems/eldiron", |
3991 | "type": "path" | 3991 | "type": "path" |
3992 | }, | 3992 | }, |
@@ -4012,7 +4012,7 @@ | |||
4012 | }, | 4012 | }, |
4013 | "locked": { | 4013 | "locked": { |
4014 | "lastModified": 1, | 4014 | "lastModified": 1, |
4015 | "narHash": "sha256-VJIMYLlvdSRrH+7fNxxblLTu44rvTLmP6YfeGg0/D4g=", | 4015 | "narHash": "sha256-rQTnAiIRXzIVEORZtQ5olYOCUyZMX8E7pB5CtwNsLT8=", |
4016 | "path": "../systems/monitoring-1", | 4016 | "path": "../systems/monitoring-1", |
4017 | "type": "path" | 4017 | "type": "path" |
4018 | }, | 4018 | }, |
@@ -4037,7 +4037,7 @@ | |||
4037 | }, | 4037 | }, |
4038 | "locked": { | 4038 | "locked": { |
4039 | "lastModified": 1, | 4039 | "lastModified": 1, |
4040 | "narHash": "sha256-KLvAqCYrbObYWyUnUzMHUKo0FIt5DO/g7AuAbGrYaYs=", | 4040 | "narHash": "sha256-Y8fj3YZOTJBzRyyCQWP2FJFSSucwMSqWp15xj4wq9wo=", |
4041 | "path": "../systems/quatresaisons", | 4041 | "path": "../systems/quatresaisons", |
4042 | "type": "path" | 4042 | "type": "path" |
4043 | }, | 4043 | }, |
@@ -7657,7 +7657,7 @@ | |||
7657 | }, | 7657 | }, |
7658 | "locked": { | 7658 | "locked": { |
7659 | "lastModified": 1, | 7659 | "lastModified": 1, |
7660 | "narHash": "sha256-JoRDMcdd3yCwmMTcntzqPOEKRuubert3/1S1hLHIwbg=", | 7660 | "narHash": "sha256-UtTwF1ni+Qy4n65KjH2WLtb263VIf7fnvVWExxSMR6U=", |
7661 | "path": "../../flakes/private/monitoring", | 7661 | "path": "../../flakes/private/monitoring", |
7662 | "type": "path" | 7662 | "type": "path" |
7663 | }, | 7663 | }, |
@@ -8544,7 +8544,7 @@ | |||
8544 | }, | 8544 | }, |
8545 | "locked": { | 8545 | "locked": { |
8546 | "lastModified": 1, | 8546 | "lastModified": 1, |
8547 | "narHash": "sha256-JoRDMcdd3yCwmMTcntzqPOEKRuubert3/1S1hLHIwbg=", | 8547 | "narHash": "sha256-UtTwF1ni+Qy4n65KjH2WLtb263VIf7fnvVWExxSMR6U=", |
8548 | "path": "./private/monitoring", | 8548 | "path": "./private/monitoring", |
8549 | "type": "path" | 8549 | "type": "path" |
8550 | }, | 8550 | }, |
diff --git a/flakes/flake.lock b/flakes/flake.lock index c06e084..1881d0f 100644 --- a/flakes/flake.lock +++ b/flakes/flake.lock | |||
@@ -2879,7 +2879,7 @@ | |||
2879 | }, | 2879 | }, |
2880 | "locked": { | 2880 | "locked": { |
2881 | "lastModified": 1, | 2881 | "lastModified": 1, |
2882 | "narHash": "sha256-JoRDMcdd3yCwmMTcntzqPOEKRuubert3/1S1hLHIwbg=", | 2882 | "narHash": "sha256-UtTwF1ni+Qy4n65KjH2WLtb263VIf7fnvVWExxSMR6U=", |
2883 | "path": "../../flakes/private/monitoring", | 2883 | "path": "../../flakes/private/monitoring", |
2884 | "type": "path" | 2884 | "type": "path" |
2885 | }, | 2885 | }, |
@@ -2897,7 +2897,7 @@ | |||
2897 | }, | 2897 | }, |
2898 | "locked": { | 2898 | "locked": { |
2899 | "lastModified": 1, | 2899 | "lastModified": 1, |
2900 | "narHash": "sha256-JoRDMcdd3yCwmMTcntzqPOEKRuubert3/1S1hLHIwbg=", | 2900 | "narHash": "sha256-UtTwF1ni+Qy4n65KjH2WLtb263VIf7fnvVWExxSMR6U=", |
2901 | "path": "../../flakes/private/monitoring", | 2901 | "path": "../../flakes/private/monitoring", |
2902 | "type": "path" | 2902 | "type": "path" |
2903 | }, | 2903 | }, |
@@ -2915,7 +2915,7 @@ | |||
2915 | }, | 2915 | }, |
2916 | "locked": { | 2916 | "locked": { |
2917 | "lastModified": 1, | 2917 | "lastModified": 1, |
2918 | "narHash": "sha256-JoRDMcdd3yCwmMTcntzqPOEKRuubert3/1S1hLHIwbg=", | 2918 | "narHash": "sha256-UtTwF1ni+Qy4n65KjH2WLtb263VIf7fnvVWExxSMR6U=", |
2919 | "path": "../../flakes/private/monitoring", | 2919 | "path": "../../flakes/private/monitoring", |
2920 | "type": "path" | 2920 | "type": "path" |
2921 | }, | 2921 | }, |
@@ -2933,7 +2933,7 @@ | |||
2933 | }, | 2933 | }, |
2934 | "locked": { | 2934 | "locked": { |
2935 | "lastModified": 1, | 2935 | "lastModified": 1, |
2936 | "narHash": "sha256-JoRDMcdd3yCwmMTcntzqPOEKRuubert3/1S1hLHIwbg=", | 2936 | "narHash": "sha256-UtTwF1ni+Qy4n65KjH2WLtb263VIf7fnvVWExxSMR6U=", |
2937 | "path": "../../flakes/private/monitoring", | 2937 | "path": "../../flakes/private/monitoring", |
2938 | "type": "path" | 2938 | "type": "path" |
2939 | }, | 2939 | }, |
@@ -3818,7 +3818,7 @@ | |||
3818 | }, | 3818 | }, |
3819 | "locked": { | 3819 | "locked": { |
3820 | "lastModified": 1, | 3820 | "lastModified": 1, |
3821 | "narHash": "sha256-dcGCP4uE6vafVgQ65G5W8iSBYvfCZSJnyH5jD3b2fr0=", | 3821 | "narHash": "sha256-jYDd12hVtZ0RjPzp/xM3qmi7FXPPBykqwd6vwrgwf4c=", |
3822 | "path": "../systems/backup-2", | 3822 | "path": "../systems/backup-2", |
3823 | "type": "path" | 3823 | "type": "path" |
3824 | }, | 3824 | }, |
@@ -3841,7 +3841,7 @@ | |||
3841 | }, | 3841 | }, |
3842 | "locked": { | 3842 | "locked": { |
3843 | "lastModified": 1, | 3843 | "lastModified": 1, |
3844 | "narHash": "sha256-2NsoEf/geroWa/Ja3KXjWJ/fwtu4oPIHghKTbePvcUM=", | 3844 | "narHash": "sha256-Auu8c8lLeB6+qvZrv+KxdguCN4sjSDwI/FNoSx6Aoj0=", |
3845 | "path": "../systems/dilion", | 3845 | "path": "../systems/dilion", |
3846 | "type": "path" | 3846 | "type": "path" |
3847 | }, | 3847 | }, |
@@ -3890,7 +3890,7 @@ | |||
3890 | }, | 3890 | }, |
3891 | "locked": { | 3891 | "locked": { |
3892 | "lastModified": 1, | 3892 | "lastModified": 1, |
3893 | "narHash": "sha256-mO4nIxuAllmkJETKABkF/l2+FgPOXfPZn2A1pgY/Cq0=", | 3893 | "narHash": "sha256-v+ViigN/4JW/nivZkfWgcOzlIN1obZ3yq+0BOf0rA5Q=", |
3894 | "path": "../systems/eldiron", | 3894 | "path": "../systems/eldiron", |
3895 | "type": "path" | 3895 | "type": "path" |
3896 | }, | 3896 | }, |
@@ -3916,7 +3916,7 @@ | |||
3916 | }, | 3916 | }, |
3917 | "locked": { | 3917 | "locked": { |
3918 | "lastModified": 1, | 3918 | "lastModified": 1, |
3919 | "narHash": "sha256-VJIMYLlvdSRrH+7fNxxblLTu44rvTLmP6YfeGg0/D4g=", | 3919 | "narHash": "sha256-rQTnAiIRXzIVEORZtQ5olYOCUyZMX8E7pB5CtwNsLT8=", |
3920 | "path": "../systems/monitoring-1", | 3920 | "path": "../systems/monitoring-1", |
3921 | "type": "path" | 3921 | "type": "path" |
3922 | }, | 3922 | }, |
@@ -3941,7 +3941,7 @@ | |||
3941 | }, | 3941 | }, |
3942 | "locked": { | 3942 | "locked": { |
3943 | "lastModified": 1, | 3943 | "lastModified": 1, |
3944 | "narHash": "sha256-KLvAqCYrbObYWyUnUzMHUKo0FIt5DO/g7AuAbGrYaYs=", | 3944 | "narHash": "sha256-Y8fj3YZOTJBzRyyCQWP2FJFSSucwMSqWp15xj4wq9wo=", |
3945 | "path": "../systems/quatresaisons", | 3945 | "path": "../systems/quatresaisons", |
3946 | "type": "path" | 3946 | "type": "path" |
3947 | }, | 3947 | }, |
@@ -7483,7 +7483,7 @@ | |||
7483 | }, | 7483 | }, |
7484 | "locked": { | 7484 | "locked": { |
7485 | "lastModified": 1, | 7485 | "lastModified": 1, |
7486 | "narHash": "sha256-JoRDMcdd3yCwmMTcntzqPOEKRuubert3/1S1hLHIwbg=", | 7486 | "narHash": "sha256-UtTwF1ni+Qy4n65KjH2WLtb263VIf7fnvVWExxSMR6U=", |
7487 | "path": "../../flakes/private/monitoring", | 7487 | "path": "../../flakes/private/monitoring", |
7488 | "type": "path" | 7488 | "type": "path" |
7489 | }, | 7489 | }, |
@@ -8410,7 +8410,7 @@ | |||
8410 | }, | 8410 | }, |
8411 | "locked": { | 8411 | "locked": { |
8412 | "lastModified": 1, | 8412 | "lastModified": 1, |
8413 | "narHash": "sha256-JoRDMcdd3yCwmMTcntzqPOEKRuubert3/1S1hLHIwbg=", | 8413 | "narHash": "sha256-UtTwF1ni+Qy4n65KjH2WLtb263VIf7fnvVWExxSMR6U=", |
8414 | "path": "./private/monitoring", | 8414 | "path": "./private/monitoring", |
8415 | "type": "path" | 8415 | "type": "path" |
8416 | }, | 8416 | }, |
diff --git a/flakes/private/monitoring/myplugins.nix b/flakes/private/monitoring/myplugins.nix index eb2fbd1..ca47b71 100644 --- a/flakes/private/monitoring/myplugins.nix +++ b/flakes/private/monitoring/myplugins.nix | |||
@@ -248,20 +248,19 @@ in | |||
248 | }; | 248 | }; |
249 | megaraid = let | 249 | megaraid = let |
250 | megacli = pkgs.megacli.overrideAttrs(old: { meta = old.meta // { license = null; }; }); | 250 | megacli = pkgs.megacli.overrideAttrs(old: { meta = old.meta // { license = null; }; }); |
251 | rawPlugin = pkgs.fetchurl { | ||
252 | name = "check_megaraid_sas"; | ||
253 | url = "https://exchange.nagios.org/components/com_mtree/attachment.php?link_id=6381&cf_id=24"; | ||
254 | sha256 = "0yf60p4c0hb4q3fng9fc14qc89bqm0f1sijayzygadaqcl44jx4p"; | ||
255 | }; | ||
251 | in { | 256 | in { |
252 | commands = { | 257 | commands = { |
253 | check_megaraid = "$USER2$/check_megaraid_sas --sudo"; | 258 | check_megaraid = "$USER2$/check_megaraid_sas --sudo"; |
254 | }; | 259 | }; |
255 | chunk = let | 260 | chunk = let |
256 | megaCliPlugin = pkgs.runCommand "megaCliPlugin" { | 261 | megaCliPlugin = pkgs.runCommand "megaCliPlugin" {} '' |
257 | plugin = pkgs.fetchurl { | ||
258 | name = "check_megaraid_sas"; | ||
259 | url = "https://exchange.nagios.org/components/com_mtree/attachment.php?link_id=6381&cf_id=24"; | ||
260 | sha256 = "0yf60p4c0hb4q3fng9fc14qc89bqm0f1sijayzygadaqcl44jx4p"; | ||
261 | }; | ||
262 | } '' | ||
263 | mkdir $out | 262 | mkdir $out |
264 | cp $plugin $out/check_megaraid_sas | 263 | cp ${rawPlugin} $out/check_megaraid_sas |
265 | chmod +x $out/check_megaraid_sas | 264 | chmod +x $out/check_megaraid_sas |
266 | patchShebangs $out | 265 | patchShebangs $out |
267 | substituteInPlace $out/check_megaraid_sas --replace /usr/sbin/MegaCli ${megacli}/bin/MegaCli64 | 266 | substituteInPlace $out/check_megaraid_sas --replace /usr/sbin/MegaCli ${megacli}/bin/MegaCli64 |
@@ -278,6 +277,13 @@ in | |||
278 | ]; | 277 | ]; |
279 | runAs = "root"; | 278 | runAs = "root"; |
280 | }; | 279 | }; |
280 | debianScript = "${pkgs.runCommand "megacli-plugin" {} '' | ||
281 | mkdir $out | ||
282 | cp ${rawPlugin} $out/check_megaraid_sas | ||
283 | chmod +wx $out/check_megaraid_sas | ||
284 | sed -i -e 's@/usr/sbin/MegaCli@/usr/sbin/megacli@' $out/check_megaraid_sas | ||
285 | ''}/check_megaraid_sas"; | ||
286 | debianPackages = [ "perl" ]; | ||
281 | }; | 287 | }; |
282 | memory = { | 288 | memory = { |
283 | commands = { | 289 | commands = { |
@@ -293,16 +299,16 @@ in | |||
293 | debianScript = "${./plugins}/check_mem.sh"; | 299 | debianScript = "${./plugins}/check_mem.sh"; |
294 | debianPackages = [ "grep" "mawk" "procps" ]; | 300 | debianPackages = [ "grep" "mawk" "procps" ]; |
295 | }; | 301 | }; |
296 | smartctl = { | 302 | smartctl = let |
303 | smartPlugin = pkgs.fetchurl { | ||
304 | url = "https://www.claudiokuenzler.com/monitoring-plugins/check_smart.pl"; | ||
305 | sha256 = "sha256-gxGkzyycUl+I3WziKhOnZSoQjpqbPqjbunfUQxmeb7w="; | ||
306 | }; | ||
307 | in { | ||
297 | commands = { | 308 | commands = { |
298 | check_smartctl = "$USER2$/check_smartctl -i auto -d $ARG1$"; | 309 | check_smartctl = "$USER2$/check_smartctl -s -i auto -d $ARG1$"; |
299 | }; | 310 | }; |
300 | chunk = let | 311 | chunk = '' |
301 | smartPlugin = pkgs.fetchurl { | ||
302 | url = "https://www.claudiokuenzler.com/monitoring-plugins/check_smart.pl"; | ||
303 | sha256 = "sha256-gxGkzyycUl+I3WziKhOnZSoQjpqbPqjbunfUQxmeb7w="; | ||
304 | }; | ||
305 | in '' | ||
306 | cp ${smartPlugin} $out/check_smartctl | 312 | cp ${smartPlugin} $out/check_smartctl |
307 | chmod +x $out/check_smartctl | 313 | chmod +x $out/check_smartctl |
308 | patchShebangs $out | 314 | patchShebangs $out |
@@ -316,6 +322,12 @@ in | |||
316 | ]; | 322 | ]; |
317 | runAs = "root"; | 323 | runAs = "root"; |
318 | }; | 324 | }; |
325 | debianScript = "${pkgs.runCommand "smart-plugin" {} '' | ||
326 | mkdir $out | ||
327 | cp ${smartPlugin} $out/check_smart.pl | ||
328 | chmod +x $out/check_smart.pl | ||
329 | ''}/check_smart.pl"; | ||
330 | debianPackages = [ "perl" ]; | ||
319 | }; | 331 | }; |
320 | mysql = { | 332 | mysql = { |
321 | commands = { | 333 | commands = { |
diff --git a/systems/backup-2/flake.lock b/systems/backup-2/flake.lock index ac6095b..baf7dcd 100644 --- a/systems/backup-2/flake.lock +++ b/systems/backup-2/flake.lock | |||
@@ -417,7 +417,7 @@ | |||
417 | }, | 417 | }, |
418 | "locked": { | 418 | "locked": { |
419 | "lastModified": 1, | 419 | "lastModified": 1, |
420 | "narHash": "sha256-JoRDMcdd3yCwmMTcntzqPOEKRuubert3/1S1hLHIwbg=", | 420 | "narHash": "sha256-UtTwF1ni+Qy4n65KjH2WLtb263VIf7fnvVWExxSMR6U=", |
421 | "path": "../../flakes/private/monitoring", | 421 | "path": "../../flakes/private/monitoring", |
422 | "type": "path" | 422 | "type": "path" |
423 | }, | 423 | }, |
diff --git a/systems/dilion/flake.lock b/systems/dilion/flake.lock index b5bf0ce..71557c0 100644 --- a/systems/dilion/flake.lock +++ b/systems/dilion/flake.lock | |||
@@ -207,7 +207,7 @@ | |||
207 | }, | 207 | }, |
208 | "locked": { | 208 | "locked": { |
209 | "lastModified": 1, | 209 | "lastModified": 1, |
210 | "narHash": "sha256-JoRDMcdd3yCwmMTcntzqPOEKRuubert3/1S1hLHIwbg=", | 210 | "narHash": "sha256-UtTwF1ni+Qy4n65KjH2WLtb263VIf7fnvVWExxSMR6U=", |
211 | "path": "../../flakes/private/monitoring", | 211 | "path": "../../flakes/private/monitoring", |
212 | "type": "path" | 212 | "type": "path" |
213 | }, | 213 | }, |
diff --git a/systems/eldiron/flake.lock b/systems/eldiron/flake.lock index 8c8872a..599cdf2 100644 --- a/systems/eldiron/flake.lock +++ b/systems/eldiron/flake.lock | |||
@@ -2066,7 +2066,7 @@ | |||
2066 | }, | 2066 | }, |
2067 | "locked": { | 2067 | "locked": { |
2068 | "lastModified": 1, | 2068 | "lastModified": 1, |
2069 | "narHash": "sha256-JoRDMcdd3yCwmMTcntzqPOEKRuubert3/1S1hLHIwbg=", | 2069 | "narHash": "sha256-UtTwF1ni+Qy4n65KjH2WLtb263VIf7fnvVWExxSMR6U=", |
2070 | "path": "../../flakes/private/monitoring", | 2070 | "path": "../../flakes/private/monitoring", |
2071 | "type": "path" | 2071 | "type": "path" |
2072 | }, | 2072 | }, |
diff --git a/systems/monitoring-1/flake.lock b/systems/monitoring-1/flake.lock index 973a9ef..dd2a52e 100644 --- a/systems/monitoring-1/flake.lock +++ b/systems/monitoring-1/flake.lock | |||
@@ -277,7 +277,7 @@ | |||
277 | }, | 277 | }, |
278 | "locked": { | 278 | "locked": { |
279 | "lastModified": 1, | 279 | "lastModified": 1, |
280 | "narHash": "sha256-JoRDMcdd3yCwmMTcntzqPOEKRuubert3/1S1hLHIwbg=", | 280 | "narHash": "sha256-UtTwF1ni+Qy4n65KjH2WLtb263VIf7fnvVWExxSMR6U=", |
281 | "path": "../../flakes/private/monitoring", | 281 | "path": "../../flakes/private/monitoring", |
282 | "type": "path" | 282 | "type": "path" |
283 | }, | 283 | }, |
diff --git a/systems/monitoring-1/monitoring-master.nix b/systems/monitoring-1/monitoring-master.nix index 6981672..ae1930c 100644 --- a/systems/monitoring-1/monitoring-master.nix +++ b/systems/monitoring-1/monitoring-master.nix | |||
@@ -66,6 +66,7 @@ in | |||
66 | $USER201$=@@TOKEN@@ | 66 | $USER201$=@@TOKEN@@ |
67 | ''; | 67 | ''; |
68 | }; | 68 | }; |
69 | "=/common/debian-packages".alias = pkgs.writeText "debian-packages" (builtins.concatStringsSep " " config.myServices.monitoring.availablePlugins.base.debianPackages); | ||
69 | "=/common/.env.example".alias = ./monitoring/env.example; | 70 | "=/common/.env.example".alias = ./monitoring/env.example; |
70 | "=/common/docker-compose.yml".alias = ./monitoring/docker-compose.yml; | 71 | "=/common/docker-compose.yml".alias = ./monitoring/docker-compose.yml; |
71 | "=/common/Dockerfile".alias = ./monitoring/Dockerfile; | 72 | "=/common/Dockerfile".alias = ./monitoring/Dockerfile; |
diff --git a/systems/monitoring-1/monitoring/Dockerfile b/systems/monitoring-1/monitoring/Dockerfile index 4bbf01b..e99b065 100644 --- a/systems/monitoring-1/monitoring/Dockerfile +++ b/systems/monitoring-1/monitoring/Dockerfile | |||
@@ -3,13 +3,11 @@ FROM debian:bookworm | |||
3 | ARG namespace | 3 | ARG namespace |
4 | 4 | ||
5 | RUN \ | 5 | RUN \ |
6 | apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ | 6 | apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y curl |
7 | curl \ | ||
8 | gnupg | ||
9 | 7 | ||
10 | RUN \ | 8 | RUN \ |
11 | curl -s "https://build.opensuse.org/projects/home:naemon/signing_keys/download?kind=gpg" | gpg --dearmor > /usr/share/keyrings/naemon.gpg \ | 9 | curl -s -o /etc/apt/trusted.gpg.d/naemon.asc "https://build.opensuse.org/projects/home:naemon/signing_keys/download?kind=gpg" \ |
12 | && echo "deb [signed-by=/usr/share/keyrings/naemon.gpg] https://download.opensuse.org/repositories/home:/naemon/Debian_12/ ./" >> /etc/apt/sources.list.d/naemon-stable.list | 10 | && echo "deb [signed-by=/etc/apt/trusted.gpg.d/naemon.asc] http://download.opensuse.org/repositories/home:/naemon/Debian_$(. /etc/os-release && echo "$VERSION_ID")/ ./" >> /etc/apt/sources.list.d/naemon-stable.list |
13 | 11 | ||
14 | # Install the baseline packages for this image. Note, these | 12 | # Install the baseline packages for this image. Note, these |
15 | # packages are not version controlled and may change between | 13 | # packages are not version controlled and may change between |
@@ -17,7 +15,7 @@ RUN \ | |||
17 | RUN apt-get update && \ | 15 | RUN apt-get update && \ |
18 | DEBIAN_FRONTEND=noninteractive \ | 16 | DEBIAN_FRONTEND=noninteractive \ |
19 | # La liste des packages debian à installer est directement fournie par Immae | 17 | # La liste des packages debian à installer est directement fournie par Immae |
20 | apt-get install -y $(curl https://status.immae.eu/$namespace/debian-packages) | 18 | apt-get install -y $(curl -s https://status.immae.eu/${namespace:-common}/debian-packages) |
21 | 19 | ||
22 | # Perform the data directory initialization | 20 | # Perform the data directory initialization |
23 | RUN mkdir -p /data/var/log/naemon \ | 21 | RUN mkdir -p /data/var/log/naemon \ |
diff --git a/systems/quatresaisons/flake.lock b/systems/quatresaisons/flake.lock index cb2d403..95e58d0 100644 --- a/systems/quatresaisons/flake.lock +++ b/systems/quatresaisons/flake.lock | |||
@@ -239,7 +239,7 @@ | |||
239 | }, | 239 | }, |
240 | "locked": { | 240 | "locked": { |
241 | "lastModified": 1, | 241 | "lastModified": 1, |
242 | "narHash": "sha256-JoRDMcdd3yCwmMTcntzqPOEKRuubert3/1S1hLHIwbg=", | 242 | "narHash": "sha256-UtTwF1ni+Qy4n65KjH2WLtb263VIf7fnvVWExxSMR6U=", |
243 | "path": "../../flakes/private/monitoring", | 243 | "path": "../../flakes/private/monitoring", |
244 | "type": "path" | 244 | "type": "path" |
245 | }, | 245 | }, |