changeset 11:2eab3e6b89f2

more scrapes and other updates
author drewp@bigasterisk.com
date Mon, 16 Jan 2023 01:05:31 -0800
parents 2023a6ce7bc0
children b6720e379d5b
files config/scrape_main.yaml deploy_vmalert.yaml ingress.yaml
diffstat 3 files changed, 18 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/config/scrape_main.yaml	Sun Dec 04 02:09:40 2022 -0800
+++ b/config/scrape_main.yaml	Mon Jan 16 01:05:31 2023 -0800
@@ -128,6 +128,16 @@
       - targets:
           - pipe:8080
 
+  - job_name: "dnsmasq-log"
+    static_configs:
+      - targets:
+          - pipe:9991
+
+  - job_name: "zfs"
+    static_configs:
+      - targets:
+          - bang:9985
+
   - job_name: "ping"
     scrape_interval: 2m
     metrics_path: /probe
@@ -138,7 +148,7 @@
           # printer, since it falls out of ntop with no traffic at all. Or, we could poll ink status at http://10.2.0.37/general/status.html?pageid=1
           - printer014032ED
           # frontbed, for monitoring
-          - 10.5.0.17
+#          - 10.5.0.17 # too flaky
           # asher bulb, not sure why it sleeps so long
           - bulb1
 
--- a/deploy_vmalert.yaml	Sun Dec 04 02:09:40 2022 -0800
+++ b/deploy_vmalert.yaml	Mon Jan 16 01:05:31 2023 -0800
@@ -21,21 +21,18 @@
           image: bang5:5000/vmalert
           args:
             - -configCheckInterval=5s
-            - -datasource.url=http://victoriametrics.default.svc.cluster.local./m/
+            - -datasource.url=http://victoriametrics/m/
             - -external.url=https://bigasterisk.com/vmalert
             - -loggerLevel=INFO
             - -loggerTimezone=America/Los_Angeles
             - -memory.allowedBytes=512MB
-            - -notifier.url=http://alertmanager.default.svc.cluster.local.
-            - -remoteRead.url=http://victoriametrics.default.svc.cluster.local./m/
-            - -remoteWrite.url=http://victoriametrics.default.svc.cluster.local./m/
+            - -notifier.url=http://alertmanager
+            - -remoteRead.url=http://victoriametrics/m/
+            - -remoteWrite.url=http://victoriametrics/m/
             - -rule=/local/rules/*.yaml
             - -rule=/local/rules/build/*.yaml
           ports:
             - containerPort: 8880
-          resources:
-            limits:
-              memory: 0.5Gi
 ---
 apiVersion: v1
 kind: Service
--- a/ingress.yaml	Sun Dec 04 02:09:40 2022 -0800
+++ b/ingress.yaml	Mon Jan 16 01:05:31 2023 -0800
@@ -3,7 +3,7 @@
 metadata:
   name: victoriametrics
   annotations:
-    cert-manager.io/issuer: letsencrypt-prod
+    cert-manager.io/cluster-issuer: letsencrypt-prod
     ingress.pomerium.io/allow_public_unauthenticated_access: "false"
     ingress.pomerium.io/pass_identity_headers: "true"
     ingress.pomerium.io/preserve_host_header: "true"
@@ -31,7 +31,7 @@
 metadata:
   name: vmalert
   annotations:
-    cert-manager.io/issuer: letsencrypt-prod
+    cert-manager.io/cluster-issuer: letsencrypt-prod
     ingress.pomerium.io/allow_public_unauthenticated_access: "false"
     ingress.pomerium.io/pass_identity_headers: "true"
     ingress.pomerium.io/preserve_host_header: "true"
@@ -59,7 +59,7 @@
 metadata:
   name: alertmanager
   annotations:
-    cert-manager.io/issuer: letsencrypt-prod
+    cert-manager.io/cluster-issuer: letsencrypt-prod
     ingress.pomerium.io/allow_public_unauthenticated_access: "false"
     ingress.pomerium.io/pass_identity_headers: "true"
     ingress.pomerium.io/preserve_host_header: "true"