Merge pull request #37 from frezes/feat/customizingRules

[kube-prometheus-stack] remove heritage-service and fix rules
WizTelemetry · Dec 27, 2023 · d96b9c3 · d96b9c3
2 parents 472d40f + b9e48f3
commit d96b9c3
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 81 deletions.
diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml
@@ -21,7 +21,7 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-version: 52.1.5
+version: 52.1.6
 appVersion: v0.68.0
 kubeVersion: ">=1.19.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus

diff --git a/charts/kube-prometheus-stack/extension_values.yaml b/charts/kube-prometheus-stack/extension_values.yaml
@@ -13,6 +13,8 @@ global:
 
 
 prometheus:
+  # agentMode: true
+
   prometheusSpec:
     image:
       registry: quay.io
@@ -32,6 +34,9 @@ prometheus:
           resources:
             requests:
               storage: 20Gi
+
+    # remoteWrite:
+    #  - url: http://prometheus-k8s.kubesphere-monitoring-system.svc:9090/api/v1/receive
 
 prometheusOperator:
   image:

diff --git a/charts/kube-prometheus-stack/templates/alertmanager/heritage-service.yaml b/charts/kube-prometheus-stack/templates/alertmanager/heritage-service.yaml
diff --git a/charts/kube-prometheus-stack/templates/prometheus/heritage-service.yaml b/charts/kube-prometheus-stack/templates/prometheus/heritage-service.yaml
diff --git a/...ube-prometheus-stack/templates/prometheus/rules-1.14/whizard-telemetry-cluster.rules.yaml b/...ube-prometheus-stack/templates/prometheus/rules-1.14/whizard-telemetry-cluster.rules.yaml
@@ -34,11 +34,11 @@ spec:
                         kube_pod_owner{owner_kind!~"ReplicaSet|DaemonSet|StatefulSet|Job"},
                         "workload",
                         "$1",
-                        "owner_kind"
+                        "owner_name"
                       ),
                       "workload_type",
                       "$1",
-                      "owner_name"
+                      "owner_kind"
                     )
                   or
                       kube_pod_owner{owner_kind=~"ReplicaSet|DaemonSet|StatefulSet|Job"}

diff --git a/ks-prometheus/components/whizard-telemetry-mixin/rules/custom.libsonnet b/ks-prometheus/components/whizard-telemetry-mixin/rules/custom.libsonnet
@@ -31,11 +31,11 @@
                               kube_pod_owner{owner_kind!~"ReplicaSet|DaemonSet|StatefulSet|Job"},
                               "workload",
                               "$1",
-                              "owner_kind"
+                              "owner_name"
                             ),
                             "workload_type",
                             "$1",
-                            "owner_name"
+                            "owner_kind"
                           )
                         or
                             kube_pod_owner{owner_kind=~"ReplicaSet|DaemonSet|StatefulSet|Job"}

diff --git a/ks-prometheus/manifests/whizard-telemetry-prometheusRule.yaml b/ks-prometheus/manifests/whizard-telemetry-prometheusRule.yaml
@@ -22,11 +22,11 @@ spec:
                         kube_pod_owner{owner_kind!~"ReplicaSet|DaemonSet|StatefulSet|Job"},
                         "workload",
                         "$1",
-                        "owner_kind"
+                        "owner_name"
                       ),
                       "workload_type",
                       "$1",
-                      "owner_name"
+                      "owner_kind"
                     )
                   or
                       kube_pod_owner{owner_kind=~"ReplicaSet|DaemonSet|StatefulSet|Job"}