From 30ef13d4b536d23e21ec87dc17744b0408ecd784 Mon Sep 17 00:00:00 2001 From: liyang Date: Mon, 23 Dec 2024 19:33:25 +0800 Subject: [PATCH 1/2] chore: Add instance label to the prometheusrule description --- jsonnet/kube-prometheus/components/mixin/alerts/node.libsonnet | 2 +- manifests/kubePrometheus-prometheusRule.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jsonnet/kube-prometheus/components/mixin/alerts/node.libsonnet b/jsonnet/kube-prometheus/components/mixin/alerts/node.libsonnet index 5bad9bf8da..e9f7d6394b 100644 --- a/jsonnet/kube-prometheus/components/mixin/alerts/node.libsonnet +++ b/jsonnet/kube-prometheus/components/mixin/alerts/node.libsonnet @@ -8,7 +8,7 @@ alert: 'NodeNetworkInterfaceFlapping', annotations: { summary: 'Network interface is often changing its status', - description: 'Network interface "{{ $labels.device }}" changing its up status often on node-exporter {{ $labels.namespace }}/{{ $labels.pod }}', + description: 'The network interface "{{ $labels.device }}" at "{{ $labels.instance }}" changing its up status often on node-exporter {{ $labels.namespace }}/{{ $labels.pod }}', }, expr: ||| changes(node_network_up{%(nodeExporterSelector)s,%(hostNetworkInterfaceSelector)s}[2m]) > 2 diff --git a/manifests/kubePrometheus-prometheusRule.yaml b/manifests/kubePrometheus-prometheusRule.yaml index 1356ee9dc9..2230a3cde5 100644 --- a/manifests/kubePrometheus-prometheusRule.yaml +++ b/manifests/kubePrometheus-prometheusRule.yaml @@ -53,7 +53,7 @@ spec: rules: - alert: NodeNetworkInterfaceFlapping annotations: - description: Network interface "{{ $labels.device }}" changing its up status often on node-exporter {{ $labels.namespace }}/{{ $labels.pod }} + description: The network interface "{{ $labels.device }}" at "{{ $labels.instance }}" changing its up status often on node-exporter {{ $labels.namespace }}/{{ $labels.pod }} runbook_url: https://runbooks.prometheus-operator.dev/runbooks/general/nodenetworkinterfaceflapping summary: Network interface is often changing its status expr: | From c31047128ddf5ec2e247ac390f9fe354091fc482 Mon Sep 17 00:00:00 2001 From: liyang Date: Mon, 23 Dec 2024 20:11:17 +0800 Subject: [PATCH 2/2] chore: add gitignore --- .gitignore | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.gitignore b/.gitignore index 98c1b91325..46c3eb138f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,12 @@ crdschemas/ developer-workspace/gitpod/_output developer-workspace/codespaces/kind + +# editor and IDE paraphernalia +.idea +*.swp +*.swo +*~ + +# macOS +.DS_Store