diff --git a/charts/prometheus-node-exporter/Chart.yaml b/charts/prometheus-node-exporter/Chart.yaml index 2fe13dfdfbbf..4fde1cffca82 100644 --- a/charts/prometheus-node-exporter/Chart.yaml +++ b/charts/prometheus-node-exporter/Chart.yaml @@ -6,7 +6,7 @@ keywords: - prometheus - exporter type: application -version: 4.21.4 +version: 4.21.5 appVersion: 1.6.0 home: https://github.com/prometheus/node_exporter/ sources: @@ -31,4 +31,4 @@ dependencies: - condition: CalicoExporter.enabled name: CalicoExporter repository: file://charts/calico-exporter - version: 0.2.* + version: 0.3.* diff --git a/charts/prometheus-node-exporter/charts/calico-exporter/Chart.yaml b/charts/prometheus-node-exporter/charts/calico-exporter/Chart.yaml index 73f4d2e668ec..a61c6560d6a0 100644 --- a/charts/prometheus-node-exporter/charts/calico-exporter/Chart.yaml +++ b/charts/prometheus-node-exporter/charts/calico-exporter/Chart.yaml @@ -16,12 +16,12 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.2.2 +version: 0.3.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.2.0" +appVersion: "0.3.0" keywords: - calico - prometheus @@ -29,4 +29,3 @@ keywords: maintainers: - email: wangyifei@kubesphere.io name: wangyifei - diff --git a/charts/prometheus-node-exporter/charts/calico-exporter/rules/calico.yaml b/charts/prometheus-node-exporter/charts/calico-exporter/rules/calico.yaml index c4c7bd3eb9f5..3443da9699f8 100644 --- a/charts/prometheus-node-exporter/charts/calico-exporter/rules/calico.yaml +++ b/charts/prometheus-node-exporter/charts/calico-exporter/rules/calico.yaml @@ -2,47 +2,45 @@ apiVersion: alerting.kubesphere.io/v2beta1 kind: GlobalRuleGroup metadata: annotations: - alerting.kubesphere.io/initial-configuration: | - {"apiVersion":"alerting.kubesphere.io/v2beta1","kind":"GlobalRuleGroup","metadata":{"annotations":{},"labels":{"alerting.kubesphere.io/builtin":"true","alerting.kubesphere.io/enable":"true"},"name":"calico-bgp"},"spec":{"rules":[{"alert":"CalicoBGPRouterDown","annotations":{"description":"Calico BGP router {{ $labels.instance }} ({{ $labels.router_id }}) is down.","runbook_url":"https://alert-runbooks.kubesphere.io/runbooks/calico/calicobgprouterdown","summary":"Calico BGP router is down."},"expr":"calico_bgp_router_info{up=\"false\"} == 1\n","for":"5m","labels":{"rule_id":"6a9f0b8a4c7e4c9d8f3b5a6c0d8f9e7b"},"severity":"critical"},{"alert":"CalicoBGPPeerStateAbnormal","annotations":{"description":"Calico BGP peer {{ $labels.name }} ({{ $labels.ip }}) is not in established state.","runbook_url":"https://alert-runbooks.kubesphere.io/runbooks/calico/calicobgppeerstateabnormal","summary":"Calico BGP peer state is abnormal."},"expr":"calico_bgp_peer_info{bgp_state!=\"Established\"} == 1\n","for":"5m","labels":{"rule_id":"8f7c4f0a9d6a4b0c9f3a7b8c6d7f8e9c"},"severity":"warning"},{"alert":"CalicoBGPPeerBirdStateDown","annotations":{"description":"Calico BGP peer {{ $labels.name }} ({{ $labels.ip }}) has bird state down.","runbook_url":"https://alert-runbooks.kubesphere.io/runbooks/calico/calicobgppeerbirdstatedown","summary":"Calico BGP peer bird state is down."},"expr":"calico_bgp_peer_info{bird_state!=\"up\"} == 1\n","for":"5m","labels":{"rule_id":"9d6b4e1a8c7b4c0d8f3b7a6c0d8f9e7d"},"severity":"critical"},{"alert":"CalicoIPPoolUsageHigh","annotations":{"description":"Calico IP pool {{ $labels.name }} ({{ $labels.cidr }}) has {{ $value | humanizePercentage }} of IPs allocated.","runbook_url":"https://alert-runbooks.kubesphere.io/runbooks/calico/calicopoolusagehigh","summary":"Calico IP pool usage is high."},"expr":"calico_ippool_allocated_ips / calico_ippool_capacity \u003e= 0.9\n","for":"5m","labels":{"rule_id":"a7b8c9d0e1f2g3h4i5j6k7l8m9n0o1p2"},"severity":"warning"}]}} + alerting.kubesphere.io/initial-configuration: '{"apiVersion":"alerting.kubesphere.io/v2beta1","kind":"GlobalRuleGroup","metadata":{"annotations":{},"labels":{"alerting.kubesphere.io/builtin":"true","alerting.kubesphere.io/enable":"true"},"name":"calico-bgp"},"spec":{"rules":[{"alert":"CalicoBGPBirdDown","annotations":{"description":"Calico BGP bird {{ $labels.instance }} ({{ $labels.router_id }}) is down.","runbook_url":"https://alert-runbooks.kubesphere.io/runbooks/calico/calicobgpbirddown","summary":"Calico BGP bird is down."},"expr":"calico_bgp_bird_info{up=\"false\"} == 1\n","for":"5m","labels":{"rule_id":"6a9f0b8a4c7e4c9d8f3b5a6c0d8f9e7b"},"severity":"critical"},{"alert":"CalicoBirdLastRebootTimestampChanged","expr":"increase(calico_bgp_bird_last_reboot_timestamp_seconds[5m]) > 1\n","labels":{"rule_id":"e7b8f9a6c0d8f3b7a6c0d8f9e7d9d6b4"},"severity":"warn","annotations":{"summary":"Calico BGP bird last reboot timestamp has changed.","description":"Calico BGP bird {{ $labels.instance }} ({{ $labels.router_id }}) last reboot timestamp has changed.","runbook_url":"https://alert-runbooks.kubesphere.io/runbooks/calico/calicobirdlastreboottimestampchanged"}},{"alert":"CalicoBGPPeerStateAbnormal","annotations":{"description":"Calico BGP peer {{ $labels.name }} ({{ $labels.ip }}) is not in established state.","runbook_url":"https://alert-runbooks.kubesphere.io/runbooks/calico/calicobgppeerstateabnormal","summary":"Calico BGP peer connection state is abnormal."},"expr":"calico_bgp_peer_info{conn_state!=\"Established\"} == 1\n","for":"5m","labels":{"rule_id":"8f7c4f0a9d6a4b0c9f3a7b8c6d7f8e9c"},"severity":"warning"},{"alert":"CalicoIPPoolUsageHigh","annotations":{"description":"Calico IP pool {{ $labels.name }} ({{ $labels.cidr }}) has {{ $value | humanizePercentage }} of IPs allocated.","runbook_url":"https://alert-runbooks.kubesphere.io/runbooks/calico/calicopoolusagehigh","summary":"Calico IP pool usage is high."},"expr":"calico_ippool_allocated_ips / calico_ippool_capacity >= 0.9\n","for":"5m","labels":{"rule_id":"a7b8c9d0e1f2g3h4i5j6k7l8m9n0o1p2"},"severity":"warning"}]}}' labels: alerting.kubesphere.io/builtin: "true" alerting.kubesphere.io/enable: "true" - name: calico-exporter-rules + name: calico-bgp + namespace: kubesphere-monitoring-system spec: rules: - - alert: CalicoBGPRouterDown + - alert: CalicoBGPBirdDown annotations: - description: 'Calico BGP router {{ $labels.instance }} ({{ $labels.router_id }}) is down.' - runbook_url: https://alert-runbooks.kubesphere.io/runbooks/calico/calicobgprouterdown - summary: Calico BGP router is down. + description: 'Calico BGP bird {{ $labels.instance }} ({{ $labels.router_id }}) is down.' + runbook_url: https://alert-runbooks.kubesphere.io/runbooks/calico/calicobgpbirddown + summary: Calico BGP bird is down. expr: | - calico_bgp_router_info{up="false"} == 1 + calico_bgp_bird_info{up="false"} == 1 for: 5m labels: rule_id: 6a9f0b8a4c7e4c9d8f3b5a6c0d8f9e7b severity: critical + - alert: CalicoBirdLastRebootTimestampChanged + expr: increase(calico_bgp_bird_last_reboot_timestamp_seconds[5m]) > 5 + labels: + rule_id: e7b8f9a6c0d8f3b7a6c0d8f9e7d9d6b4 + severity: warn + annotations: + summary: Calico BGP bird last reboot timestamp has changed. + description: "Calico BGP bird {{ $labels.instance }} ({{ $labels.router_id }}) last reboot timestamp has changed." + runbook_url: https://alert-runbooks.kubesphere.io/runbooks/calico/calicobirdlastreboottimestampchanged - alert: CalicoBGPPeerStateAbnormal annotations: description: 'Calico BGP peer {{ $labels.name }} ({{ $labels.ip }}) is not in established state.' runbook_url: https://alert-runbooks.kubesphere.io/runbooks/calico/calicobgppeerstateabnormal - summary: Calico BGP peer state is abnormal. + summary: Calico BGP peer connection state is abnormal. expr: | - calico_bgp_peer_info{bgp_state!="Established"} == 1 + calico_bgp_peer_info{conn_state!="Established"} == 1 for: 5m labels: rule_id: 8f7c4f0a9d6a4b0c9f3a7b8c6d7f8e9c severity: warning - - alert: CalicoBGPPeerBirdStateDown - annotations: - description: 'Calico BGP peer {{ $labels.name }} ({{ $labels.ip }}) has bird state down.' - runbook_url: https://alert-runbooks.kubesphere.io/runbooks/calico/calicobgppeerbirdstatedown - summary: Calico BGP peer bird state is down. - expr: | - calico_bgp_peer_info{bird_state!="up"} == 1 - for: 5m - labels: - rule_id: 9d6b4e1a8c7b4c0d8f3b7a6c0d8f9e7d - severity: critical - alert: CalicoIPPoolUsageHigh annotations: description: 'Calico IP pool {{ $labels.name }} ({{ $labels.cidr }}) has {{ $value | humanizePercentage }} of IPs allocated.' diff --git a/charts/prometheus-node-exporter/charts/calico-exporter/values.yaml b/charts/prometheus-node-exporter/charts/calico-exporter/values.yaml index 97bfb86b4c80..4a36b25950eb 100644 --- a/charts/prometheus-node-exporter/charts/calico-exporter/values.yaml +++ b/charts/prometheus-node-exporter/charts/calico-exporter/values.yaml @@ -4,7 +4,7 @@ image: registry: "" repository: kubesphere/calico-exporter - tag: v0.2.0 + tag: v0.3.0 digest: "" pullPolicy: IfNotPresent @@ -72,7 +72,7 @@ securityContext: runAsNonRoot: true runAsUser: 65534 -hostNetwork: false +hostNetwork: true ## Assign a group of affinity scheduling rules ## diff --git a/charts/prometheus-node-exporter/values.yaml b/charts/prometheus-node-exporter/values.yaml index 54ce100cb6b1..19194bfb8a2d 100644 --- a/charts/prometheus-node-exporter/values.yaml +++ b/charts/prometheus-node-exporter/values.yaml @@ -639,7 +639,7 @@ CalicoExporter: # Declare variables to be passed into your templates. image: repository: kubesphere/calico-exporter - tag: v0.2.0 + tag: v0.3.0 pullPolicy: IfNotPresent ## Creates a Prometheus Operator ServiceMonitor @@ -704,7 +704,7 @@ CalicoExporter: runAsNonRoot: true runAsUser: 65534 - hostNetwork: false + hostNetwork: true ## Assign a group of affinity scheduling rules ##