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

Update kubelet_scrape_config example #1464

Merged
merged 4 commits into from
Dec 17, 2024
Merged

Update kubelet_scrape_config example #1464

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1fad641
update kubelet_scrape_config example
jaronoff97 Dec 13, 2024
00a9530
urgh
jaronoff97 Dec 13, 2024
3c6e7a9
Merge branch 'main' into fix-kubelet-example
TylerHelmuth Dec 16, 2024
eca1e72
version bump
jaronoff97 Dec 17, 2024
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
2 changes: 1 addition & 1 deletion charts/opentelemetry-kube-stack/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: opentelemetry-kube-stack
version: 0.3.7
version: 0.3.8
description: |
OpenTelemetry Quickstart chart for Kubernetes.
Installs an operator and collector for an easy way to get started with Kubernetes observability.
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/bridge.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: OpAMPBridge
metadata:
name: example
labels:
helm.sh/chart: opentelemetry-kube-stack-0.3.7
helm.sh/chart: opentelemetry-kube-stack-0.3.8
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/collector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-cluster-stats
namespace: default
labels:
helm.sh/chart: opentelemetry-kube-stack-0.3.7
helm.sh/chart: opentelemetry-kube-stack-0.3.8
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down Expand Up @@ -187,7 +187,7 @@ metadata:
name: example-daemon
namespace: default
labels:
helm.sh/chart: opentelemetry-kube-stack-0.3.7
helm.sh/chart: opentelemetry-kube-stack-0.3.8
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
44 changes: 1 addition & 43 deletions charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/hooks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,47 +1,5 @@
---
# Source: opentelemetry-kube-stack/templates/hooks.yaml
apiVersion: v1
jaronoff97 marked this conversation as resolved.
Show resolved Hide resolved
kind: ServiceAccount
metadata:
name: delete-resources-sa
annotations:
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
---
# Source: opentelemetry-kube-stack/templates/hooks.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: delete-resources-role
annotations:
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
rules:
- apiGroups:
- opentelemetry.io
resources:
- instrumentations
- opampbridges
- opentelemetrycollectors
verbs:
- get
- list
- delete
---
# Source: opentelemetry-kube-stack/templates/hooks.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: delete-resources-rolebinding
annotations:
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: delete-resources-role
subjects:
- kind: ServiceAccount
name: delete-resources-sa
---
# Source: opentelemetry-kube-stack/templates/hooks.yaml
apiVersion: batch/v1
kind: Job
metadata:
Expand All @@ -62,4 +20,4 @@ spec:
- -c
- |
kubectl delete instrumentations,opampbridges,opentelemetrycollectors \
-l helm.sh/chart=opentelemetry-kube-stack-0.3.7
-l helm.sh/chart=opentelemetry-kube-stack-0.3.8
2 changes: 1 addition & 1 deletion charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/instrumentation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: Instrumentation
metadata:
name: example
labels:
helm.sh/chart: opentelemetry-kube-stack-0.3.7
helm.sh/chart: opentelemetry-kube-stack-0.3.8
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
42 changes: 21 additions & 21 deletions charts/opentelemetry-kube-stack/examples/prometheus-otel/kubelet_scrape_configs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
relabel_configs:
- action: replace
regex: "(.*)"
replacement: "$1"
replacement: "$$1"
separator: ";"
source_labels:
- job
Expand All @@ -25,7 +25,7 @@
target_label: job
- action: replace
regex: "(.*)"
replacement: "${1}"
replacement: "$$1"
separator: ";"
source_labels:
- __meta_kubernetes_node_name
Expand All @@ -37,22 +37,22 @@
target_label: endpoint
- action: replace
regex: "(.*)"
replacement: "$1"
replacement: "$$1"
separator: ";"
source_labels:
- __metrics_path__
target_label: metrics_path
- action: hashmod
modulus: 1
regex: "(.*)"
replacement: "$1"
replacement: "$$1"
separator: ";"
source_labels:
- __address__
target_label: __tmp_hash
- action: keep
regex: "$(SHARD)"
replacement: "$1"
replacement: "$$1"
separator: ";"
source_labels:
- __tmp_hash
Expand Down Expand Up @@ -81,37 +81,37 @@
metric_relabel_configs:
- action: drop
regex: container_cpu_(cfs_throttled_seconds_total|load_average_10s|system_seconds_total|user_seconds_total)
replacement: "$1"
replacement: "$$1"
separator: ";"
source_labels:
- __name__
- action: drop
regex: container_fs_(io_current|io_time_seconds_total|io_time_weighted_seconds_total|reads_merged_total|sector_reads_total|sector_writes_total|writes_merged_total)
replacement: "$1"
replacement: "$$1"
separator: ";"
source_labels:
- __name__
- action: drop
regex: container_memory_(mapped_file|swap)
replacement: "$1"
replacement: "$$1"
separator: ";"
source_labels:
- __name__
- action: drop
regex: container_(file_descriptors|tasks_state|threads_max)
replacement: "$1"
replacement: "$$1"
separator: ";"
source_labels:
- __name__
- action: drop
regex: container_spec.*
replacement: "$1"
replacement: "$$1"
separator: ";"
source_labels:
- __name__
- action: drop
regex: ".+;"
replacement: "$1"
replacement: "$$1"
separator: ";"
source_labels:
- id
Expand All @@ -120,7 +120,7 @@
relabel_configs:
- action: replace
regex: "(.*)"
replacement: "$1"
replacement: "$$1"
separator: ";"
source_labels:
- job
Expand All @@ -130,7 +130,7 @@
target_label: job
- action: replace
regex: "(.*)"
replacement: "${1}"
replacement: "$$1"
separator: ";"
source_labels:
- __meta_kubernetes_node_name
Expand All @@ -142,22 +142,22 @@
target_label: endpoint
- action: replace
regex: "(.*)"
replacement: "$1"
replacement: "$$1"
separator: ";"
source_labels:
- __metrics_path__
target_label: metrics_path
- action: hashmod
modulus: 1
regex: "(.*)"
replacement: "$1"
replacement: "$$1"
separator: ";"
source_labels:
- __address__
target_label: __tmp_hash
- action: keep
regex: "$(SHARD)"
replacement: "$1"
replacement: "$$1"
separator: ";"
source_labels:
- __tmp_hash
Expand Down Expand Up @@ -189,7 +189,7 @@
relabel_configs:
- action: replace
regex: "(.*)"
replacement: "$1"
replacement: "$$1"
separator: ";"
source_labels:
- job
Expand All @@ -199,7 +199,7 @@
target_label: job
- action: replace
regex: "(.*)"
replacement: "${1}"
replacement: "$$1"
separator: ";"
source_labels:
- __meta_kubernetes_node_name
Expand All @@ -211,22 +211,22 @@
target_label: endpoint
- action: replace
regex: "(.*)"
replacement: "$1"
replacement: "$$1"
separator: ";"
source_labels:
- __metrics_path__
target_label: metrics_path
- action: hashmod
modulus: 1
regex: "(.*)"
replacement: "$1"
replacement: "$$1"
separator: ";"
source_labels:
- __address__
target_label: __tmp_hash
- action: keep
regex: "$(SHARD)"
replacement: "$1"
replacement: "$$1"
separator: ";"
source_labels:
- __tmp_hash
Expand Down
Loading
Loading