Skip to content

Commit 2720abf

Browse files
dloucasfxdloucasfx
committed
Change health check and prom internal metrics ports to a unique value in preparation to allow running Cluster Receiver in host network namespace without conflicting with the agent
Signed-off-by: Dani Louca <[email protected]>
1 parent d26e04e commit 2720abf

File tree

65 files changed

+191
-190
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+191
-190
lines changed

‎examples/add-filter-processor/rendered_manifests/configmap-cluster-receiver.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ data:
2626
timeout: 10s
2727
extensions:
2828
health_check:
29-
endpoint: 0.0.0.0:13133
29+
endpoint: 0.0.0.0:13134
3030
processors:
3131
batch:
3232
send_batch_max_size: 32768
@@ -92,7 +92,7 @@ data:
9292
scrape_interval: 10s
9393
static_configs:
9494
- targets:
95-
- localhost:8889
95+
- localhost:8899
9696
service:
9797
extensions:
9898
- health_check
@@ -126,7 +126,7 @@ data:
126126
exporter:
127127
prometheus:
128128
host: localhost
129-
port: 8889
129+
port: 8899
130130
without_scope_info: true
131131
without_type_suffix: true
132132
without_units: true

‎examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
component: otel-k8s-cluster-receiver
3232
release: default
3333
annotations:
34-
checksum/config: 5c52f76690cf9d3fa19576c63e81053bd92dd408933fefb8366b22a6fc4feabd
34+
checksum/config: 9b3e23be59d5817ef8f8280f8c83220d34333c90130776341e87e6cf9e8fa5fd
3535
spec:
3636
serviceAccountName: default-splunk-otel-collector
3737
nodeSelector:
@@ -74,11 +74,11 @@ spec:
7474
readinessProbe:
7575
httpGet:
7676
path: /
77-
port: 13133
77+
port: 13134
7878
livenessProbe:
7979
httpGet:
8080
path: /
81-
port: 13133
81+
port: 13134
8282
resources:
8383
limits:
8484
cpu: 200m

‎examples/add-kafkametrics-receiver/rendered_manifests/configmap-cluster-receiver.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ data:
2626
timeout: 10s
2727
extensions:
2828
health_check:
29-
endpoint: 0.0.0.0:13133
29+
endpoint: 0.0.0.0:13134
3030
processors:
3131
batch:
3232
send_batch_max_size: 32768
@@ -92,7 +92,7 @@ data:
9292
scrape_interval: 10s
9393
static_configs:
9494
- targets:
95-
- localhost:8889
95+
- localhost:8899
9696
service:
9797
extensions:
9898
- health_check
@@ -126,7 +126,7 @@ data:
126126
exporter:
127127
prometheus:
128128
host: localhost
129-
port: 8889
129+
port: 8899
130130
without_scope_info: true
131131
without_type_suffix: true
132132
without_units: true

‎examples/add-kafkametrics-receiver/rendered_manifests/deployment-cluster-receiver.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
component: otel-k8s-cluster-receiver
3232
release: default
3333
annotations:
34-
checksum/config: 5c52f76690cf9d3fa19576c63e81053bd92dd408933fefb8366b22a6fc4feabd
34+
checksum/config: 9b3e23be59d5817ef8f8280f8c83220d34333c90130776341e87e6cf9e8fa5fd
3535
spec:
3636
serviceAccountName: default-splunk-otel-collector
3737
nodeSelector:
@@ -74,11 +74,11 @@ spec:
7474
readinessProbe:
7575
httpGet:
7676
path: /
77-
port: 13133
77+
port: 13134
7878
livenessProbe:
7979
httpGet:
8080
path: /
81-
port: 13133
81+
port: 13134
8282
resources:
8383
limits:
8484
cpu: 200m

‎examples/add-receiver-creator/rendered_manifests/configmap-cluster-receiver.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ data:
2626
timeout: 10s
2727
extensions:
2828
health_check:
29-
endpoint: 0.0.0.0:13133
29+
endpoint: 0.0.0.0:13134
3030
processors:
3131
batch:
3232
send_batch_max_size: 32768
@@ -92,7 +92,7 @@ data:
9292
scrape_interval: 10s
9393
static_configs:
9494
- targets:
95-
- localhost:8889
95+
- localhost:8899
9696
service:
9797
extensions:
9898
- health_check
@@ -126,7 +126,7 @@ data:
126126
exporter:
127127
prometheus:
128128
host: localhost
129-
port: 8889
129+
port: 8899
130130
without_scope_info: true
131131
without_type_suffix: true
132132
without_units: true

‎examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
component: otel-k8s-cluster-receiver
3232
release: default
3333
annotations:
34-
checksum/config: 5c52f76690cf9d3fa19576c63e81053bd92dd408933fefb8366b22a6fc4feabd
34+
checksum/config: 9b3e23be59d5817ef8f8280f8c83220d34333c90130776341e87e6cf9e8fa5fd
3535
spec:
3636
serviceAccountName: default-splunk-otel-collector
3737
nodeSelector:
@@ -74,11 +74,11 @@ spec:
7474
readinessProbe:
7575
httpGet:
7676
path: /
77-
port: 13133
77+
port: 13134
7878
livenessProbe:
7979
httpGet:
8080
path: /
81-
port: 13133
81+
port: 13134
8282
resources:
8383
limits:
8484
cpu: 200m

‎examples/add-sampler/rendered_manifests/configmap-cluster-receiver.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ data:
2626
timeout: 10s
2727
extensions:
2828
health_check:
29-
endpoint: 0.0.0.0:13133
29+
endpoint: 0.0.0.0:13134
3030
processors:
3131
batch:
3232
send_batch_max_size: 32768
@@ -92,7 +92,7 @@ data:
9292
scrape_interval: 10s
9393
static_configs:
9494
- targets:
95-
- localhost:8889
95+
- localhost:8899
9696
service:
9797
extensions:
9898
- health_check
@@ -126,7 +126,7 @@ data:
126126
exporter:
127127
prometheus:
128128
host: localhost
129-
port: 8889
129+
port: 8899
130130
without_scope_info: true
131131
without_type_suffix: true
132132
without_units: true

‎examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
component: otel-k8s-cluster-receiver
3232
release: default
3333
annotations:
34-
checksum/config: 5c52f76690cf9d3fa19576c63e81053bd92dd408933fefb8366b22a6fc4feabd
34+
checksum/config: 9b3e23be59d5817ef8f8280f8c83220d34333c90130776341e87e6cf9e8fa5fd
3535
spec:
3636
serviceAccountName: default-splunk-otel-collector
3737
nodeSelector:
@@ -74,11 +74,11 @@ spec:
7474
readinessProbe:
7575
httpGet:
7676
path: /
77-
port: 13133
77+
port: 13134
7878
livenessProbe:
7979
httpGet:
8080
path: /
81-
port: 13133
81+
port: 13134
8282
resources:
8383
limits:
8484
cpu: 200m

‎examples/autodetect-istio/rendered_manifests/configmap-cluster-receiver.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ data:
2626
timeout: 10s
2727
extensions:
2828
health_check:
29-
endpoint: 0.0.0.0:13133
29+
endpoint: 0.0.0.0:13134
3030
processors:
3131
batch:
3232
send_batch_max_size: 32768
@@ -92,7 +92,7 @@ data:
9292
scrape_interval: 10s
9393
static_configs:
9494
- targets:
95-
- localhost:8889
95+
- localhost:8899
9696
service:
9797
extensions:
9898
- health_check
@@ -126,7 +126,7 @@ data:
126126
exporter:
127127
prometheus:
128128
host: localhost
129-
port: 8889
129+
port: 8899
130130
without_scope_info: true
131131
without_type_suffix: true
132132
without_units: true

‎examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
component: otel-k8s-cluster-receiver
3232
release: default
3333
annotations:
34-
checksum/config: 5c52f76690cf9d3fa19576c63e81053bd92dd408933fefb8366b22a6fc4feabd
34+
checksum/config: 9b3e23be59d5817ef8f8280f8c83220d34333c90130776341e87e6cf9e8fa5fd
3535
sidecar.istio.io/inject: "false"
3636
spec:
3737
serviceAccountName: default-splunk-otel-collector
@@ -75,11 +75,11 @@ spec:
7575
readinessProbe:
7676
httpGet:
7777
path: /
78-
port: 13133
78+
port: 13134
7979
livenessProbe:
8080
httpGet:
8181
path: /
82-
port: 13133
82+
port: 13134
8383
resources:
8484
limits:
8585
cpu: 200m

‎examples/collector-all-modes/rendered_manifests/configmap-cluster-receiver.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ data:
2626
timeout: 10s
2727
extensions:
2828
health_check:
29-
endpoint: 0.0.0.0:13133
29+
endpoint: 0.0.0.0:13134
3030
processors:
3131
batch:
3232
send_batch_max_size: 32768
@@ -92,7 +92,7 @@ data:
9292
scrape_interval: 10s
9393
static_configs:
9494
- targets:
95-
- localhost:8889
95+
- localhost:8899
9696
service:
9797
extensions:
9898
- health_check
@@ -126,7 +126,7 @@ data:
126126
exporter:
127127
prometheus:
128128
host: localhost
129-
port: 8889
129+
port: 8899
130130
without_scope_info: true
131131
without_type_suffix: true
132132
without_units: true

‎examples/collector-all-modes/rendered_manifests/deployment-cluster-receiver.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
component: otel-k8s-cluster-receiver
3232
release: default
3333
annotations:
34-
checksum/config: 5c52f76690cf9d3fa19576c63e81053bd92dd408933fefb8366b22a6fc4feabd
34+
checksum/config: 9b3e23be59d5817ef8f8280f8c83220d34333c90130776341e87e6cf9e8fa5fd
3535
spec:
3636
serviceAccountName: default-splunk-otel-collector
3737
nodeSelector:
@@ -74,11 +74,11 @@ spec:
7474
readinessProbe:
7575
httpGet:
7676
path: /
77-
port: 13133
77+
port: 13134
7878
livenessProbe:
7979
httpGet:
8080
path: /
81-
port: 13133
81+
port: 13134
8282
resources:
8383
limits:
8484
cpu: 200m

‎examples/collector-cluster-receiver-only/rendered_manifests/configmap-cluster-receiver.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ data:
3232
token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
3333
extensions:
3434
health_check:
35-
endpoint: 0.0.0.0:13133
35+
endpoint: 0.0.0.0:13134
3636
processors:
3737
batch:
3838
send_batch_max_size: 32768
@@ -137,7 +137,7 @@ data:
137137
scrape_interval: 10s
138138
static_configs:
139139
- targets:
140-
- localhost:8889
140+
- localhost:8899
141141
service:
142142
extensions:
143143
- health_check
@@ -183,7 +183,7 @@ data:
183183
exporter:
184184
prometheus:
185185
host: localhost
186-
port: 8889
186+
port: 8899
187187
without_scope_info: true
188188
without_type_suffix: true
189189
without_units: true

‎examples/collector-cluster-receiver-only/rendered_manifests/deployment-cluster-receiver.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
component: otel-k8s-cluster-receiver
3232
release: default
3333
annotations:
34-
checksum/config: 1443ca5116860d6c85d3c192d973cfe6c265ba8728ed5a75b6a07b267727072e
34+
checksum/config: 9372d43841c4ad5f94219f4b2d22673d501223fbdfcbec4694477f1662f47d70
3535
spec:
3636
serviceAccountName: default-splunk-otel-collector
3737
nodeSelector:
@@ -74,11 +74,11 @@ spec:
7474
readinessProbe:
7575
httpGet:
7676
path: /
77-
port: 13133
77+
port: 13134
7878
livenessProbe:
7979
httpGet:
8080
path: /
81-
port: 13133
81+
port: 13134
8282
resources:
8383
limits:
8484
cpu: 200m

‎examples/controlplane-histogram-metrics/rendered_manifests/configmap-cluster-receiver.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ data:
2626
timeout: 10s
2727
extensions:
2828
health_check:
29-
endpoint: 0.0.0.0:13133
29+
endpoint: 0.0.0.0:13134
3030
processors:
3131
batch:
3232
send_batch_max_size: 32768
@@ -92,7 +92,7 @@ data:
9292
scrape_interval: 10s
9393
static_configs:
9494
- targets:
95-
- localhost:8889
95+
- localhost:8899
9696
service:
9797
extensions:
9898
- health_check
@@ -126,7 +126,7 @@ data:
126126
exporter:
127127
prometheus:
128128
host: localhost
129-
port: 8889
129+
port: 8899
130130
without_scope_info: true
131131
without_type_suffix: true
132132
without_units: true

‎examples/controlplane-histogram-metrics/rendered_manifests/deployment-cluster-receiver.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
component: otel-k8s-cluster-receiver
3232
release: default
3333
annotations:
34-
checksum/config: 5c52f76690cf9d3fa19576c63e81053bd92dd408933fefb8366b22a6fc4feabd
34+
checksum/config: 9b3e23be59d5817ef8f8280f8c83220d34333c90130776341e87e6cf9e8fa5fd
3535
spec:
3636
serviceAccountName: default-splunk-otel-collector
3737
nodeSelector:
@@ -74,11 +74,11 @@ spec:
7474
readinessProbe:
7575
httpGet:
7676
path: /
77-
port: 13133
77+
port: 13134
7878
livenessProbe:
7979
httpGet:
8080
path: /
81-
port: 13133
81+
port: 13134
8282
resources:
8383
limits:
8484
cpu: 200m

0 commit comments

Comments
 (0)