Merge branch 'rosalina/master'

sshca/secrets.yaml

@@ -63,7 +63,7 @@ metadata:
   namespace: sshca
 spec:
   encryptedData:
-    machine-ids.json: AgCmwNtLiL3SbRthy7TIMcKtNWzo2Xm1uSpdyWAWSxLnuyfBDT7sgNn2ILma/bCW9zJe/EaPbbZDgeUbcob1YWLkm6gBEZ8UkA0z/Jgu9hyvVDFoicvDFcmpLiPviyUrak7mmioeOgshAKmHAILa5m1fWNjbzxy0UgkjrGPJA9GXF/g1BFerf/kp5qAkpk0zAONx3ToganSDL7wXj4Mz6x2bb4Nu4s6kdyWdaxyz3evOzvBcy9HRl9Yyq/sIjW/nSahrTs1iwtWDOqF7j5pLmUa5FBoD2hlPmDUCC2Sw5JhwDJd2KuTV811Sl4qk60xLrp6RLlbhrhq3XsRPsUJm/5F8s7kKr2KPtEZu24+uZ12w7DYxlkuEJSlRcH1g/BMc1SD4PDQ2UJK04uQN6RVZlkm8bBYKunMniX9btF4ECXNlgYe0jr7o1SHj862tSnx63GJ4LVnO6Q8ahuM5d9BqMduo+8gpLBVb8vV1pT0zDhLVDGAsDHZE7s8V84eDn83iqlIVaTkUyUt4UAVvRseXENk7s2wyTSf7hYEbVPfcoMfuYR//PQWlN1+iEHtwxU6wSYEBmAXEuS0HXUAVFo55XSQylLDZBERkP0xD1svVFUV062hfFy5sTWTgEciZItMqdX+2TFlPdojZUSj0hk0TsxnuKUBnZLDimKmMa/8e360s3t4b9q9TL4PutGbr57SFZvat5wRmDjq/YgPOtA8H1QV6U7CU5SjG2vKH7KXdoI4wGk84n+F6ECUBQ8pp8lxwlzjyIDzIYM8EEsWW3qc7EcZC7wsj1i+0MJAoauyTYQBpAu9OzwzVSpHlK4N6QNm7do0fpL8UsAX1EbdSxsLg7yWUTpNx02qiXhtLVt/csUGiokHapLxy+60b3kzHS5vpW5k=
+    machine-ids.json: AgBUC/qQazMFNaONhi4FsbFODHm4i0NYSLhFgAqkwKRHrpBu/5A6u/+z5JotFYuT8JOOoJzs0NF4M7PtOqumkgawTAn31NP0wAtSXfNVJrlRznX78tVRy/haHhK8CWddmnhBqqygVh6gTP5vtlNWGzVC9ONL82RPyLUAEReQwGICx+VRGSV2C3k178YAE2XQPQhGTGOa6KhO+uQwikThpUwk4qihzohnJ7L757fBZgJ3gsNGK1uATk2PyN2pZSuBZ3VU3pFyHStFqGceG5i8asas9+5bPnBMHlQXEvcYVcn5obfXHgy2RouIK5vkeTASmLpysuIZD17M3YnZobXSkJdn8wv/o+PD1CNM66mG2lB2kBKeCqpyKm2oEiVlX0GfM13cWDLA9FZmZS4wReUXgJijm5M73c6FWctGwGcXGe3cqPJh9O0NLYPssRtUL2LAwljGUQVLcRuCAxXVi/Aapk+aIPTZrwmtLXAcTRC0nzVjTQF+NNuv3u//t1JaSHXGmbV3ti3T5fZ5tiHbBZCLNKeYr8y9Xt7iUnf1jmTeGFD0+cY/+mzPv/o8SZA+7ASG3yq3ehoZTE6/RKC1T/DEZ2n1dMc7PTzecauPd+IotnY1zubq/V1uzyvkpihgEUEBdUzVlN+kvsAVqKmapLPOpr7U/98uJZ7afmIqgU3SLYLRMMhbmo1q5rdmX525yvGt2iQztbBNj/uou0qVHTvpMfbIOLrP0oJZ0wpeH0Q4QrDmHvMRCwKYfSkBwooiW2y9Y1mzOq+9GneuQfY9jkaSJ3R9JAUbLG6xF1O8gfbe1oZd47OuaPhOFsWQn07Du19i30a8BgeDMO9CXxHwtdhogG41eZlfUfh8bBnAjhw4T1wts5JdaAaFqwvGQrhrGOso9Ox8UsX7OWrHinCKQywetW1B7FMBvM2Q3GbsToVJW3H6WhT+CrbHqND96e+LrDazMJFzjpZ1UyRIVqAyGedXIqTqeZGMc7FELo7LZy3niafTOpJoTjRZ8quId/z8VXVUDENG9L1rdxvk4GiVNdxwlYE5ZKJEdRkjfrc87Y0Ue6Uxdyfl8+Cs5A4wnEFE1bb2HpP0D9ONAXZi8+gR09cp7ga2syuVZ/5xgo9R/5o7pWG8gkfRR9wlM6zc9JiwwKSCVYOVe9TFm21f8AFGDRdHVTEmQ0VUJJ3Y
   template:
     metadata:
       name: sshca-data

victoria-metrics/blackbox-exporter.yaml

@@ -34,7 +34,7 @@ spec:
     spec:
       containers:
       - name: blackbox-exporter
-        image: docker.io/bitnami/blackbox-exporter:0.24.0
+        image: quay.io/prometheus/blackbox-exporter:v0.24.0
         args:
         - --config.file=/etc/blackbox-exporter/blackbox.yml
         ports:
@@ -52,7 +52,6 @@ spec:
           failureThreshold: 30
           timeoutSeconds: 1
         securityContext:
-          runAsNonRoot: true
           readOnlyRootFilesystem: true
         volumeMounts:
         - mountPath: /etc/blackbox-exporter
@@ -63,6 +62,8 @@ spec:
           subPath: tmp
       securityContext:
         runAsNonRoot: true
+        runAsUser: 1422
+        runAsGroup: 1422
         sysctls:
         - name: net.ipv4.ping_group_range
           value: 0 65536

victoria-metrics/blackbox.yml

@@ -26,6 +26,8 @@ modules:
   icmp:
     prober: icmp
     timeout: 5s
+    icmp:
+      preferred_ip_protocol: ip4
   smtp:
     prober: tcp
     tcp:

victoria-metrics/scrape.yml

@@ -22,9 +22,10 @@ scrape_configs:
     - icmp
   static_configs:
   - targets:
-    - 1.1.1.1
-    - 8.8.8.8
-    - 9.9.9.9
+    - github.com
+    - cloudflare.com
+    - amazonaws.com
+    - azure.com
   relabel_configs:
   - source_labels: [__address__]
     target_label: __param_target
@@ -70,6 +71,8 @@ scrape_configs:
     - gw1.pyrocufflink.blue
     - k8s-aarch64-n0.pyrocufflink.blue
     - k8s-aarch64-n1.pyrocufflink.blue
+    - k8s-amd64-n3.pyrocufflink.blue
+    - nut0.pyrocufflink.blue
     - nvr1.pyrocufflink.blue
     - vmhost0.pyrocufflink.blue
     - vmhost1.pyrocufflink.blue
@@ -267,6 +270,8 @@ scrape_configs:
   - targets:
     - k8s-aarch64-n0.pyrocufflink.blue
     - k8s-aarch64-n1.pyrocufflink.blue
+    - k8s-amd64-n3.pyrocufflink.blue
+    - nut0.pyrocufflink.blue
     - nvr1.pyrocufflink.blue
   relabel_configs:
   - source_labels: [__address__]