From 17b09962298c263c198e9da01997c3a938371e6e Mon Sep 17 00:00:00 2001 From: simu Date: Tue, 12 May 2026 12:01:33 +0000 Subject: [PATCH 1/2] Update from template Template version: main (5ae5772) --- .cruft.json | 4 ++-- .github/workflows/release.yaml | 4 ++-- .github/workflows/test.yaml | 8 ++++---- Makefile | 2 +- Makefile.vars.mk | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.cruft.json b/.cruft.json index 43a657d..8d92151 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/projectsyn/commodore-component-template.git", - "commit": "84a7c63ca26492da555344c23ccddac302ba0bb2", + "commit": "5ae57721558399419f867334e31d23a7f7a892ba", "checkout": "main", "context": { "cookiecutter": { @@ -25,7 +25,7 @@ "github_name": "component-prometheus", "github_url": "https://github.com/projectsyn/component-prometheus", "_template": "https://github.com/projectsyn/commodore-component-template.git", - "_commit": "84a7c63ca26492da555344c23ccddac302ba0bb2" + "_commit": "5ae57721558399419f867334e31d23a7f7a892ba" } }, "directory": null diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index b0eac75..5cb5c4c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -9,12 +9,12 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 with: fetch-depth: "0" - name: Build changelog from PRs with labels id: build_changelog - uses: mikepenz/release-changelog-builder-action@v5 + uses: mikepenz/release-changelog-builder-action@v6 with: configuration: ".github/changelog-configuration.json" # PreReleases still get a changelog, but the next full release gets a diff since the last full release, diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 3766b09..60b49ec 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -17,13 +17,13 @@ jobs: - lint_yaml - lint_adoc steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - name: Run ${{ matrix.command }} run: make ${{ matrix.command }} editorconfig: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - uses: snow-actions/eclint@v1.0.1 with: args: 'check' @@ -58,7 +58,7 @@ jobs: run: working-directory: ${{ env.COMPONENT_NAME }} steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 with: path: ${{ env.COMPONENT_NAME }} - name: Compile component @@ -94,7 +94,7 @@ jobs: run: working-directory: ${{ env.COMPONENT_NAME }} steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 with: path: ${{ env.COMPONENT_NAME }} - name: Golden diff diff --git a/Makefile b/Makefile index 0646f90..5ca0af5 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ format: format_jsonnet ## All-in-one formatting .PHONY: format_jsonnet format_jsonnet: $(JSONNET_FILES) ## Format jsonnet files - $(JSONNET_DOCKER) $(JSONNETFMT_ARGS) -- $? + $(JSONNET_DOCKER) $(JSONNETFMT_ARGS) --in-place -- $? .PHONY: docs-serve docs-serve: ## Preview the documentation diff --git a/Makefile.vars.mk b/Makefile.vars.mk index 750959c..6066829 100644 --- a/Makefile.vars.mk +++ b/Makefile.vars.mk @@ -31,7 +31,7 @@ endif DOCKER_ARGS ?= run --rm -u "$$(id -u):$$(id -g)" --userns=$(DOCKER_USERNS) -w /$(COMPONENT_NAME) -e HOME="/$(COMPONENT_NAME)" JSONNET_FILES ?= $(shell find . -type f -not -path './vendor/*' \( -name '*.*jsonnet' -or -name '*.libsonnet' \)) -JSONNETFMT_ARGS ?= --in-place --pad-arrays +JSONNETFMT_ARGS ?= --pad-arrays JSONNET_IMAGE ?= ghcr.io/projectsyn/jsonnet:latest JSONNET_DOCKER ?= $(DOCKER_CMD) $(DOCKER_ARGS) $(root_volume) --entrypoint=jsonnetfmt $(JSONNET_IMAGE) From 4d2f9b86ddc40ed8e192631d458b46def71674d6 Mon Sep 17 00:00:00 2001 From: Simon Gerber Date: Tue, 12 May 2026 14:15:14 +0200 Subject: [PATCH 2/2] Update golden tests --- ...instance_grafana_dashboardDefinitions.yaml | 8 ++++---- ...-instance_nodeExporter_prometheusRule.yaml | 20 +++++++++++++++++++ ...instance_grafana_dashboardDefinitions.yaml | 8 ++++---- ...-instance_nodeExporter_prometheusRule.yaml | 20 +++++++++++++++++++ ...instance_grafana_dashboardDefinitions.yaml | 8 ++++---- ...-instance_nodeExporter_prometheusRule.yaml | 20 +++++++++++++++++++ 6 files changed, 72 insertions(+), 12 deletions(-) diff --git a/tests/golden/kubernetes_1.26/prometheus/prometheus/40_default-instance_grafana_dashboardDefinitions.yaml b/tests/golden/kubernetes_1.26/prometheus/prometheus/40_default-instance_grafana_dashboardDefinitions.yaml index 934eb4b..1360ce1 100644 --- a/tests/golden/kubernetes_1.26/prometheus/prometheus/40_default-instance_grafana_dashboardDefinitions.yaml +++ b/tests/golden/kubernetes_1.26/prometheus/prometheus/40_default-instance_grafana_dashboardDefinitions.yaml @@ -26829,7 +26829,7 @@ items: "type": "prometheus", "uid": "$datasource" }, - "expr": "instance:node_network_receive_bytes_excluding_lo:rate5m{job=\"nodeexporter-default-instance\", instance=\"$instance\", cluster=~\"$cluster\"} != 0", + "expr": "instance:node_network_receive_bytes_physical:rate5m{job=\"nodeexporter-default-instance\", instance=\"$instance\", cluster=~\"$cluster\"} != 0", "legendFormat": "Receive" }, { @@ -26837,7 +26837,7 @@ items: "type": "prometheus", "uid": "$datasource" }, - "expr": "instance:node_network_transmit_bytes_excluding_lo:rate5m{job=\"nodeexporter-default-instance\", instance=\"$instance\", cluster=~\"$cluster\"} != 0", + "expr": "instance:node_network_transmit_bytes_physical:rate5m{job=\"nodeexporter-default-instance\", instance=\"$instance\", cluster=~\"$cluster\"} != 0", "legendFormat": "Transmit" } ], @@ -26898,7 +26898,7 @@ items: "type": "prometheus", "uid": "$datasource" }, - "expr": "instance:node_network_receive_drop_excluding_lo:rate5m{job=\"nodeexporter-default-instance\", instance=\"$instance\", cluster=~\"$cluster\"} != 0", + "expr": "instance:node_network_receive_drop_physical:rate5m{job=\"nodeexporter-default-instance\", instance=\"$instance\", cluster=~\"$cluster\"} != 0", "legendFormat": "Receive" }, { @@ -26906,7 +26906,7 @@ items: "type": "prometheus", "uid": "$datasource" }, - "expr": "instance:node_network_transmit_drop_excluding_lo:rate5m{job=\"nodeexporter-default-instance\", instance=\"$instance\", cluster=~\"$cluster\"} != 0", + "expr": "instance:node_network_transmit_drop_physical:rate5m{job=\"nodeexporter-default-instance\", instance=\"$instance\", cluster=~\"$cluster\"} != 0", "legendFormat": "Transmit" } ], diff --git a/tests/golden/kubernetes_1.26/prometheus/prometheus/50_default-instance_nodeExporter_prometheusRule.yaml b/tests/golden/kubernetes_1.26/prometheus/prometheus/50_default-instance_nodeExporter_prometheusRule.yaml index ba68160..84f8cd5 100644 --- a/tests/golden/kubernetes_1.26/prometheus/prometheus/50_default-instance_nodeExporter_prometheusRule.yaml +++ b/tests/golden/kubernetes_1.26/prometheus/prometheus/50_default-instance_nodeExporter_prometheusRule.yaml @@ -445,3 +445,23 @@ spec: rate(node_network_transmit_drop_total{job="nodeexporter-default-instance", device!="lo"}[5m]) ) record: instance:node_network_transmit_drop_excluding_lo:rate5m + - expr: | + sum without (device) ( + rate(node_network_receive_bytes_total{job="nodeexporter-default-instance", device!~"lo|veth.+"}[5m]) + ) + record: instance:node_network_receive_bytes_physical:rate5m + - expr: | + sum without (device) ( + rate(node_network_transmit_bytes_total{job="nodeexporter-default-instance", device!~"lo|veth.+"}[5m]) + ) + record: instance:node_network_transmit_bytes_physical:rate5m + - expr: | + sum without (device) ( + rate(node_network_receive_drop_total{job="nodeexporter-default-instance", device!~"lo|veth.+"}[5m]) + ) + record: instance:node_network_receive_drop_physical:rate5m + - expr: | + sum without (device) ( + rate(node_network_transmit_drop_total{job="nodeexporter-default-instance", device!~"lo|veth.+"}[5m]) + ) + record: instance:node_network_transmit_drop_physical:rate5m diff --git a/tests/golden/kubernetes_1.27/prometheus/prometheus/40_default-instance_grafana_dashboardDefinitions.yaml b/tests/golden/kubernetes_1.27/prometheus/prometheus/40_default-instance_grafana_dashboardDefinitions.yaml index 934eb4b..1360ce1 100644 --- a/tests/golden/kubernetes_1.27/prometheus/prometheus/40_default-instance_grafana_dashboardDefinitions.yaml +++ b/tests/golden/kubernetes_1.27/prometheus/prometheus/40_default-instance_grafana_dashboardDefinitions.yaml @@ -26829,7 +26829,7 @@ items: "type": "prometheus", "uid": "$datasource" }, - "expr": "instance:node_network_receive_bytes_excluding_lo:rate5m{job=\"nodeexporter-default-instance\", instance=\"$instance\", cluster=~\"$cluster\"} != 0", + "expr": "instance:node_network_receive_bytes_physical:rate5m{job=\"nodeexporter-default-instance\", instance=\"$instance\", cluster=~\"$cluster\"} != 0", "legendFormat": "Receive" }, { @@ -26837,7 +26837,7 @@ items: "type": "prometheus", "uid": "$datasource" }, - "expr": "instance:node_network_transmit_bytes_excluding_lo:rate5m{job=\"nodeexporter-default-instance\", instance=\"$instance\", cluster=~\"$cluster\"} != 0", + "expr": "instance:node_network_transmit_bytes_physical:rate5m{job=\"nodeexporter-default-instance\", instance=\"$instance\", cluster=~\"$cluster\"} != 0", "legendFormat": "Transmit" } ], @@ -26898,7 +26898,7 @@ items: "type": "prometheus", "uid": "$datasource" }, - "expr": "instance:node_network_receive_drop_excluding_lo:rate5m{job=\"nodeexporter-default-instance\", instance=\"$instance\", cluster=~\"$cluster\"} != 0", + "expr": "instance:node_network_receive_drop_physical:rate5m{job=\"nodeexporter-default-instance\", instance=\"$instance\", cluster=~\"$cluster\"} != 0", "legendFormat": "Receive" }, { @@ -26906,7 +26906,7 @@ items: "type": "prometheus", "uid": "$datasource" }, - "expr": "instance:node_network_transmit_drop_excluding_lo:rate5m{job=\"nodeexporter-default-instance\", instance=\"$instance\", cluster=~\"$cluster\"} != 0", + "expr": "instance:node_network_transmit_drop_physical:rate5m{job=\"nodeexporter-default-instance\", instance=\"$instance\", cluster=~\"$cluster\"} != 0", "legendFormat": "Transmit" } ], diff --git a/tests/golden/kubernetes_1.27/prometheus/prometheus/50_default-instance_nodeExporter_prometheusRule.yaml b/tests/golden/kubernetes_1.27/prometheus/prometheus/50_default-instance_nodeExporter_prometheusRule.yaml index ba68160..84f8cd5 100644 --- a/tests/golden/kubernetes_1.27/prometheus/prometheus/50_default-instance_nodeExporter_prometheusRule.yaml +++ b/tests/golden/kubernetes_1.27/prometheus/prometheus/50_default-instance_nodeExporter_prometheusRule.yaml @@ -445,3 +445,23 @@ spec: rate(node_network_transmit_drop_total{job="nodeexporter-default-instance", device!="lo"}[5m]) ) record: instance:node_network_transmit_drop_excluding_lo:rate5m + - expr: | + sum without (device) ( + rate(node_network_receive_bytes_total{job="nodeexporter-default-instance", device!~"lo|veth.+"}[5m]) + ) + record: instance:node_network_receive_bytes_physical:rate5m + - expr: | + sum without (device) ( + rate(node_network_transmit_bytes_total{job="nodeexporter-default-instance", device!~"lo|veth.+"}[5m]) + ) + record: instance:node_network_transmit_bytes_physical:rate5m + - expr: | + sum without (device) ( + rate(node_network_receive_drop_total{job="nodeexporter-default-instance", device!~"lo|veth.+"}[5m]) + ) + record: instance:node_network_receive_drop_physical:rate5m + - expr: | + sum without (device) ( + rate(node_network_transmit_drop_total{job="nodeexporter-default-instance", device!~"lo|veth.+"}[5m]) + ) + record: instance:node_network_transmit_drop_physical:rate5m diff --git a/tests/golden/kubernetes_1.28/prometheus/prometheus/40_default-instance_grafana_dashboardDefinitions.yaml b/tests/golden/kubernetes_1.28/prometheus/prometheus/40_default-instance_grafana_dashboardDefinitions.yaml index 934eb4b..1360ce1 100644 --- a/tests/golden/kubernetes_1.28/prometheus/prometheus/40_default-instance_grafana_dashboardDefinitions.yaml +++ b/tests/golden/kubernetes_1.28/prometheus/prometheus/40_default-instance_grafana_dashboardDefinitions.yaml @@ -26829,7 +26829,7 @@ items: "type": "prometheus", "uid": "$datasource" }, - "expr": "instance:node_network_receive_bytes_excluding_lo:rate5m{job=\"nodeexporter-default-instance\", instance=\"$instance\", cluster=~\"$cluster\"} != 0", + "expr": "instance:node_network_receive_bytes_physical:rate5m{job=\"nodeexporter-default-instance\", instance=\"$instance\", cluster=~\"$cluster\"} != 0", "legendFormat": "Receive" }, { @@ -26837,7 +26837,7 @@ items: "type": "prometheus", "uid": "$datasource" }, - "expr": "instance:node_network_transmit_bytes_excluding_lo:rate5m{job=\"nodeexporter-default-instance\", instance=\"$instance\", cluster=~\"$cluster\"} != 0", + "expr": "instance:node_network_transmit_bytes_physical:rate5m{job=\"nodeexporter-default-instance\", instance=\"$instance\", cluster=~\"$cluster\"} != 0", "legendFormat": "Transmit" } ], @@ -26898,7 +26898,7 @@ items: "type": "prometheus", "uid": "$datasource" }, - "expr": "instance:node_network_receive_drop_excluding_lo:rate5m{job=\"nodeexporter-default-instance\", instance=\"$instance\", cluster=~\"$cluster\"} != 0", + "expr": "instance:node_network_receive_drop_physical:rate5m{job=\"nodeexporter-default-instance\", instance=\"$instance\", cluster=~\"$cluster\"} != 0", "legendFormat": "Receive" }, { @@ -26906,7 +26906,7 @@ items: "type": "prometheus", "uid": "$datasource" }, - "expr": "instance:node_network_transmit_drop_excluding_lo:rate5m{job=\"nodeexporter-default-instance\", instance=\"$instance\", cluster=~\"$cluster\"} != 0", + "expr": "instance:node_network_transmit_drop_physical:rate5m{job=\"nodeexporter-default-instance\", instance=\"$instance\", cluster=~\"$cluster\"} != 0", "legendFormat": "Transmit" } ], diff --git a/tests/golden/kubernetes_1.28/prometheus/prometheus/50_default-instance_nodeExporter_prometheusRule.yaml b/tests/golden/kubernetes_1.28/prometheus/prometheus/50_default-instance_nodeExporter_prometheusRule.yaml index ba68160..84f8cd5 100644 --- a/tests/golden/kubernetes_1.28/prometheus/prometheus/50_default-instance_nodeExporter_prometheusRule.yaml +++ b/tests/golden/kubernetes_1.28/prometheus/prometheus/50_default-instance_nodeExporter_prometheusRule.yaml @@ -445,3 +445,23 @@ spec: rate(node_network_transmit_drop_total{job="nodeexporter-default-instance", device!="lo"}[5m]) ) record: instance:node_network_transmit_drop_excluding_lo:rate5m + - expr: | + sum without (device) ( + rate(node_network_receive_bytes_total{job="nodeexporter-default-instance", device!~"lo|veth.+"}[5m]) + ) + record: instance:node_network_receive_bytes_physical:rate5m + - expr: | + sum without (device) ( + rate(node_network_transmit_bytes_total{job="nodeexporter-default-instance", device!~"lo|veth.+"}[5m]) + ) + record: instance:node_network_transmit_bytes_physical:rate5m + - expr: | + sum without (device) ( + rate(node_network_receive_drop_total{job="nodeexporter-default-instance", device!~"lo|veth.+"}[5m]) + ) + record: instance:node_network_receive_drop_physical:rate5m + - expr: | + sum without (device) ( + rate(node_network_transmit_drop_total{job="nodeexporter-default-instance", device!~"lo|veth.+"}[5m]) + ) + record: instance:node_network_transmit_drop_physical:rate5m