diff --git a/arm_exporter.jsonnet b/arm_exporter.jsonnet index e5a0792..47d3ac0 100644 --- a/arm_exporter.jsonnet +++ b/arm_exporter.jsonnet @@ -22,7 +22,7 @@ local kp = (import 'kube-prometheus/kube-prometheus.libsonnet') + local proxy = container.new('kube-rbac-proxy', $._config.imageRepos.kubeRbacProxy + ':' + $._config.versions.kubeRbacProxy) + container.withArgs([ - '--secure-listen-address=$(IP):9243', + '--secure-listen-address=:9243', '--upstream=http://127.0.0.1:9243/', ]) + container.withPorts(containerPort.new(9243) + containerPort.withHostPort(9243) + containerPort.withName('https')) + diff --git a/manifests/arm-exporter-daemonset.yaml b/manifests/arm-exporter-daemonset.yaml index 557e6fa..de2cdf1 100644 --- a/manifests/arm-exporter-daemonset.yaml +++ b/manifests/arm-exporter-daemonset.yaml @@ -25,7 +25,7 @@ spec: cpu: 50m memory: 50Mi - args: - - --secure-listen-address=$(IP):9243 + - --secure-listen-address=:9243 - --upstream=http://127.0.0.1:9243/ image: carlosedp/kube-rbac-proxy:v0.4.1 name: kube-rbac-proxy diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml index 25998ba..3f93c1b 100644 --- a/manifests/grafana-dashboardDefinitions.yaml +++ b/manifests/grafana-dashboardDefinitions.yaml @@ -6392,7 +6392,7 @@ items: "editable": true, "gnetId": 162, "graphTooltip": 1, - "id": 13, + "id": 7, "links": [ ], @@ -7864,10 +7864,10 @@ items: "steppedLine": false, "targets": [ { - "expr": "topk(10,sum(rate(container_network_transmit_bytes_total{name=\u007e\".+\"}[5m])) by (name))", + "expr": "topk(10,sum(rate(container_network_transmit_bytes_total{pod_name=\u007e\".+\"}[5m])) by (pod_name))", "format": "time_series", "intervalFactor": 2, - "legendFormat": "{{ name }}", + "legendFormat": "{{ pod_name }}", "refId": "A", "step": 240 }, @@ -7893,7 +7893,7 @@ items: "tooltip": { "msResolution": true, "shared": true, - "sort": 1, + "sort": 2, "value_type": "cumulative" }, "transparent": false, @@ -7985,19 +7985,19 @@ items: "steppedLine": false, "targets": [ { - "expr": "topk(10,sum(rate(container_network_receive_bytes_total{name=\u007e\".+\"}[5m])) by (name))", + "expr": "topk(10,sum(rate(container_network_receive_bytes_total{pod_name=\u007e\".+\"}[5m])) by (pod_name))", "format": "time_series", "intervalFactor": 2, - "legendFormat": "{{name}}", + "legendFormat": "{{pod_name}}", "refId": "A", "step": 240 }, { - "expr": "- rate(container_network_transmit_bytes_total{name=\u007e\".+\"}[$interval])", + "expr": "- rate(container_network_transmit_bytes_total{pod_name=\u007e\".+\"}[$interval])", "format": "time_series", "hide": true, "intervalFactor": 2, - "legendFormat": "{{name}}", + "legendFormat": "{{pod_name}}", "refId": "B", "step": 10 } @@ -8014,7 +8014,7 @@ items: "tooltip": { "msResolution": true, "shared": true, - "sort": 1, + "sort": 2, "value_type": "cumulative" }, "transparent": false,