deploy/dev/kustomization.yaml

@@ -22,17 +22,6 @@ configMapGenerator:
   behavior: merge
   files:
   - prometheus.yml=prometheus.yaml
-  - alerting_rules.yml=prometheus-alerting-rules.yaml
-  options:
-    labels:
-      app: prometheus
-- name: prometheus-alertmanager
-  behavior: merge
-  files:
-  - alertmanager.yml=prometheus-alertmanager.yaml
-  options:
-    labels:
-      app: prometheus
 - name: grafana
   behavior: merge
   files:

deploy/dev/prometheus-alerting-rules.yaml

@@ -1 +0,0 @@
-{}

deploy/dev/prometheus-alertmanager.yaml

@@ -1,17 +0,0 @@
-global: {}
-receivers:
-- name: mailgun-receiver
-  email_configs:
-  - to: alerts@netflux.io
-    from: alerts@netflux.io
-    smarthost: smtp.eu.mailgun.org:587
-    auth_username: test@example.com
-    auth_password: foobar
-    send_resolved: true
-route:
-  group_interval: 5m
-  group_wait: 10s
-  receiver: mailgun-receiver
-  repeat_interval: 3h
-templates:
-- /etc/alertmanager/*.tmpl

deploy/dev/prometheus.yaml

@@ -296,12 +296,15 @@ alerting:
     - source_labels: [__meta_kubernetes_namespace]
       regex: default
       action: keep
-    - source_labels: [__meta_kubernetes_pod_label_app_kubernetes_io_instance]
+    - source_labels: [__meta_kubernetes_pod_label_app]
       regex: prometheus
       action: keep
-    - source_labels: [__meta_kubernetes_pod_label_app_kubernetes_io_name]
+    - source_labels: [__meta_kubernetes_pod_label_component]
       regex: alertmanager
       action: keep
+    - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_probe]
+      regex: .*
+      action: keep
     - source_labels: [__meta_kubernetes_pod_container_port_number]
       regex: "9093"
       action: keep

deploy/prod/kustomization.yaml

@@ -11,17 +11,6 @@ configMapGenerator:
   behavior: merge
   files:
   - prometheus.yml=prometheus.yaml
-  - alerting_rules.yml=prometheus-alerting-rules.yaml
-  options:
-    labels:
-      app: prometheus
-- name: prometheus-alertmanager
-  behavior: merge
-  files:
-  - alertmanager.yml=secrets/prometheus-alertmanager.yaml
-  options:
-    labels:
-      app: prometheus
 - name: grafana
   behavior: merge
   files:

deploy/prod/prometheus-alerting-rules.yaml

@@ -1,10 +0,0 @@
-groups:
-- name: default-group
-  rules:
-  - alert: DBRootFSUsed
-    expr: 100 - ((node_filesystem_avail_bytes{instance="prod-db:9100",job="node",mountpoint="/",fstype!="rootfs"} * 100) / node_filesystem_size_bytes{instance="prod-db:9100",job="node",mountpoint="/",fstype!="rootfs"}) > 85
-    for: 10m
-    labels:
-      severity: alert
-    annotations:
-      summary: database disk space

deploy/prod/prometheus.yaml

@@ -293,7 +293,7 @@ scrape_configs:
   tls_config:
     insecure_skip_verify: true
   static_configs:
-    - targets: ["prod-db:9100", "prod-db:9187"]
+    - targets: ["prod-db:9100", "prod-db:9187", "prod-netflux:9100"]
 alerting:
   alertmanagers:
   - kubernetes_sd_configs:
@@ -305,12 +305,15 @@ alerting:
     - source_labels: [__meta_kubernetes_namespace]
       regex: default
       action: keep
-    - source_labels: [__meta_kubernetes_pod_label_app_kubernetes_io_instance]
+    - source_labels: [__meta_kubernetes_pod_label_app]
       regex: prometheus
       action: keep
-    - source_labels: [__meta_kubernetes_pod_label_app_kubernetes_io_name]
+    - source_labels: [__meta_kubernetes_pod_label_component]
       regex: alertmanager
       action: keep
+    - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_probe]
+      regex: .*
+      action: keep
     - source_labels: [__meta_kubernetes_pod_container_port_number]
       regex: "9093"
       action: keep