Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(helm/metrics): route metrics using job attribute instead of endpoint #3126

Merged
merged 2 commits into from
Jul 4, 2023
Merged

feat(helm/metrics): route metrics using job attribute instead of endpoint #3126

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e2b05c
feat(helm/metrics): route metrics using job attribute instead of endp…
Jun 30, 2023
d373d1c
feat: preare batches before routing
Jul 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .changelog/3126.changed.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
feat(helm/metrics): route metrics using job attribute instead of endpoint
1 change: 1 addition & 0 deletions deploy/helm/sumologic/conf/metrics/otelcol/pipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ processors:
- resource/delete_source_metadata
- sumologic_schema
- batch
- transform/prepare_routing
- routing
receivers:
- telegraf
Expand Down
18 changes: 14 additions & 4 deletions deploy/helm/sumologic/conf/metrics/otelcol/processors.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,20 @@ resource/remove_k8s_pod_pod_name:
- action: delete
key: k8s.pod.pod_name

transform/prepare_routing:
error_mode: ignore
metric_statements:
- context: metric
statements:
- set(resource.attributes["http_listener_v2_path"], "/prometheus.metrics.apiserver") where resource.attributes["job"] == "apiserver"
- set(resource.attributes["http_listener_v2_path"], "/prometheus.metrics.control-plane.coredns") where resource.attributes["job"] == "coredns"
- set(resource.attributes["http_listener_v2_path"], "/prometheus.metrics.control-plane.kube-etcd") where resource.attributes["job"] == "kube-etcd"
- set(resource.attributes["http_listener_v2_path"], "/prometheus.metrics.controller-manager") where resource.attributes["job"] == "kubelet" and IsMatch(name, "^cloudprovider_.*")
swiatekm marked this conversation as resolved.
Show resolved Hide resolved
- set(resource.attributes["http_listener_v2_path"], "/prometheus.metrics.kubelet") where resource.attributes["job"] == "kubelet" and not IsMatch(name, "^cloudprovider_.*")
- set(resource.attributes["http_listener_v2_path"], "/prometheus.metrics.node") where resource.attributes["job"] == "node-exporter"
- set(resource.attributes["http_listener_v2_path"], "/prometheus.metrics.scheduler") where resource.attributes["job"] == "kube-scheduler"
- set(resource.attributes["http_listener_v2_path"], "/prometheus.metrics.state") where resource.attributes["job"] == "kube-state-metrics"
sumo-drosiek marked this conversation as resolved.
Show resolved Hide resolved

## NOTE: below listed rules could be simplified if routingprocessor
## supports regex matching. At this point we could group route entries
## going to the same set of exporters.
Expand All @@ -124,10 +138,6 @@ routing:
- exporters:
- sumologic/apiserver
value: /prometheus.metrics.apiserver
## container metrics
- exporters:
- sumologic/kubelet
value: /prometheus.metrics.container
## control-plane metrics
- exporters:
- sumologic/control_plane
Expand Down
1 change: 1 addition & 0 deletions tests/helm/metrics_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ func TestMetadataMetricsOtelConfigExtraProcessors(t *testing.T) {
"resource/delete_source_metadata",
"sumologic_schema",
"batch",
"transform/prepare_routing",
"routing",
}

Expand Down
25 changes: 22 additions & 3 deletions tests/helm/testdata/goldenfile/metadata_metrics_otc/additional_endpoints.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,6 @@ data:
- exporters:
- sumologic/apiserver
value: /prometheus.metrics.apiserver
- exporters:
- sumologic/kubelet
value: /prometheus.metrics.container
- exporters:
- sumologic/control_plane
value: /prometheus.metrics.control-plane.coredns
Expand All @@ -223,6 +220,27 @@ data:
collector: kubernetes
sumologic_schema:
add_cloud_namespace: false
transform/prepare_routing:
error_mode: ignore
metric_statements:
- context: metric
statements:
- set(resource.attributes["http_listener_v2_path"], "/prometheus.metrics.apiserver")
where resource.attributes["job"] == "apiserver"
- set(resource.attributes["http_listener_v2_path"], "/prometheus.metrics.control-plane.coredns")
where resource.attributes["job"] == "coredns"
- set(resource.attributes["http_listener_v2_path"], "/prometheus.metrics.control-plane.kube-etcd")
where resource.attributes["job"] == "kube-etcd"
- set(resource.attributes["http_listener_v2_path"], "/prometheus.metrics.controller-manager")
where resource.attributes["job"] == "kubelet" and IsMatch(name, "^cloudprovider_.*")
- set(resource.attributes["http_listener_v2_path"], "/prometheus.metrics.kubelet")
where resource.attributes["job"] == "kubelet" and not IsMatch(name, "^cloudprovider_.*")
- set(resource.attributes["http_listener_v2_path"], "/prometheus.metrics.node")
where resource.attributes["job"] == "node-exporter"
- set(resource.attributes["http_listener_v2_path"], "/prometheus.metrics.scheduler")
where resource.attributes["job"] == "kube-scheduler"
- set(resource.attributes["http_listener_v2_path"], "/prometheus.metrics.state")
where resource.attributes["job"] == "kube-state-metrics"
receivers:
otlp:
protocols:
Expand Down Expand Up @@ -304,6 +322,7 @@ data:
- resource/delete_source_metadata
- sumologic_schema
- batch
- transform/prepare_routing
- routing
receivers:
- telegraf
Expand Down
25 changes: 22 additions & 3 deletions tests/helm/testdata/goldenfile/metadata_metrics_otc/basic.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,6 @@ data:
- exporters:
- sumologic/apiserver
value: /prometheus.metrics.apiserver
- exporters:
- sumologic/kubelet
value: /prometheus.metrics.container
- exporters:
- sumologic/control_plane
value: /prometheus.metrics.control-plane.coredns
Expand All @@ -223,6 +220,27 @@ data:
collector: kubernetes
sumologic_schema:
add_cloud_namespace: false
transform/prepare_routing:
error_mode: ignore
metric_statements:
- context: metric
statements:
- set(resource.attributes["http_listener_v2_path"], "/prometheus.metrics.apiserver")
where resource.attributes["job"] == "apiserver"
- set(resource.attributes["http_listener_v2_path"], "/prometheus.metrics.control-plane.coredns")
where resource.attributes["job"] == "coredns"
- set(resource.attributes["http_listener_v2_path"], "/prometheus.metrics.control-plane.kube-etcd")
where resource.attributes["job"] == "kube-etcd"
- set(resource.attributes["http_listener_v2_path"], "/prometheus.metrics.controller-manager")
where resource.attributes["job"] == "kubelet" and IsMatch(name, "^cloudprovider_.*")
- set(resource.attributes["http_listener_v2_path"], "/prometheus.metrics.kubelet")
where resource.attributes["job"] == "kubelet" and not IsMatch(name, "^cloudprovider_.*")
- set(resource.attributes["http_listener_v2_path"], "/prometheus.metrics.node")
where resource.attributes["job"] == "node-exporter"
- set(resource.attributes["http_listener_v2_path"], "/prometheus.metrics.scheduler")
where resource.attributes["job"] == "kube-scheduler"
- set(resource.attributes["http_listener_v2_path"], "/prometheus.metrics.state")
where resource.attributes["job"] == "kube-state-metrics"
receivers:
otlp:
protocols:
Expand Down Expand Up @@ -302,6 +320,7 @@ data:
- resource/delete_source_metadata
- sumologic_schema
- batch
- transform/prepare_routing
- routing
receivers:
- telegraf
Expand Down