Skip to content

Commit

Permalink
Add continuous discovery support
Browse files Browse the repository at this point in the history
The new continuous discovery mechanism is disabled by default. To enable it, set the following values in your configuration:
```yaml
agent:
discovery:
  enabled: true
featureGates: splunk.continuousDiscovery
```
  • Loading branch information
dmitryax committed Sep 18, 2024
1 parent d31d7cb commit 952821e
Show file tree
Hide file tree
Showing 76 changed files with 589 additions and 37 deletions.
19 changes: 19 additions & 0 deletions .chloggen/support-continuous-discovery.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement
# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other)
component: agent
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Add base configuration to support the new continuous discovery mechanism.
# One or more tracking issues related to the change
issues: [1455]
# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext: |
The new continuous discovery mechanism is disabled by default. To enable it, set the following values in your configuration:
```yaml
agent:
discovery:
enabled: true
featureGates: splunk.continuousDiscovery
```
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ metadata:
data:
relay: |
exporters:
otlphttp/entities:
headers:
X-SF-Token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event
sapm:
access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace
Expand Down Expand Up @@ -321,6 +325,7 @@ data:
- container
- pod
- node
nop: null
otlp:
protocols:
grpc:
Expand Down Expand Up @@ -427,6 +432,15 @@ data:
- filelog
- fluentforward
- otlp
logs/entities:
exporters:
- otlphttp/entities
processors:
- memory_limiter
- batch
- resourcedetection
receivers:
- nop
metrics:
exporters:
- signalfx
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: 379191976bf8590ad7e28867db39ef860a5b8288f15e5447560acd995bffca92
checksum/config: 1bc174d019b1c0db3200781d141bdd85e9956f229ef928020bc12b3290028dee
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ metadata:
data:
relay: |
exporters:
otlphttp/entities:
headers:
X-SF-Token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event
sapm:
access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace
Expand Down Expand Up @@ -277,6 +281,7 @@ data:
- container
- pod
- node
nop: null
otlp:
protocols:
grpc:
Expand Down Expand Up @@ -381,6 +386,15 @@ data:
- filelog
- fluentforward
- otlp
logs/entities:
exporters:
- otlphttp/entities
processors:
- memory_limiter
- batch
- resourcedetection
receivers:
- nop
metrics:
exporters:
- signalfx
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: 446deacf2fb4a314a607bda26d2da8d80016d1c88faa9d88a868e981119366e7
checksum/config: f8b0951fbade08c1605716def0c78e1514810cfe54beef78b899a3e3ce6add6e
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ metadata:
data:
relay: |
exporters:
otlphttp/entities:
headers:
X-SF-Token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event
sapm:
access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace
Expand Down Expand Up @@ -152,6 +156,7 @@ data:
- container
- pod
- node
nop: null
otlp:
protocols:
grpc:
Expand Down Expand Up @@ -255,6 +260,15 @@ data:
- k8s_observer
- zpages
pipelines:
logs/entities:
exporters:
- otlphttp/entities
processors:
- memory_limiter
- batch
- resourcedetection
receivers:
- nop
metrics:
exporters:
- signalfx
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: f506fde2e1c045a5e06cfa7176b1dd43440e4d8c903a05551405e9e868dd00bb
checksum/config: 98e50d7ce98b2f70056a31c79829bf02263eb9d81934c482e32e8bd715400026
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down
14 changes: 14 additions & 0 deletions examples/add-sampler/rendered_manifests/configmap-agent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ metadata:
data:
relay: |
exporters:
otlphttp/entities:
headers:
X-SF-Token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event
sapm:
access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace
Expand Down Expand Up @@ -155,6 +159,7 @@ data:
- container
- pod
- node
nop: null
otlp:
protocols:
grpc:
Expand Down Expand Up @@ -243,6 +248,15 @@ data:
- k8s_observer
- zpages
pipelines:
logs/entities:
exporters:
- otlphttp/entities
processors:
- memory_limiter
- batch
- resourcedetection
receivers:
- nop
metrics:
exporters:
- signalfx
Expand Down
2 changes: 1 addition & 1 deletion examples/add-sampler/rendered_manifests/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: f042b32c7cc95bd6c58332db9048108f22dfa29b3be87a3d909f7247e217685c
checksum/config: 365f0d879a8599abd84038331f731b37b7a55c2875d52b87e33770cca289d401
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down
14 changes: 14 additions & 0 deletions examples/autodetect-istio/rendered_manifests/configmap-agent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ metadata:
data:
relay: |
exporters:
otlphttp/entities:
headers:
X-SF-Token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event
sapm:
access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace
Expand Down Expand Up @@ -305,6 +309,7 @@ data:
- container
- pod
- node
nop: null
otlp:
protocols:
grpc:
Expand Down Expand Up @@ -418,6 +423,15 @@ data:
- filelog
- fluentforward
- otlp
logs/entities:
exporters:
- otlphttp/entities
processors:
- memory_limiter
- batch
- resourcedetection
receivers:
- nop
metrics:
exporters:
- signalfx
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: b5c3e6847ba7993a1c4b7a15de6b0117cb384b7337ed3c4a2fdb6501cb1ccb90
checksum/config: 7d3210b22369837962ec7deed92dd19372b0532162e4a127073e6b1f22033468
kubectl.kubernetes.io/default-container: otel-collector
sidecar.istio.io/inject: "false"
spec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ metadata:
data:
relay: |
exporters:
otlphttp/entities:
headers:
X-SF-Token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event
sapm:
access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace
Expand Down Expand Up @@ -152,6 +156,7 @@ data:
- container
- pod
- node
nop: null
otlp:
protocols:
grpc:
Expand Down Expand Up @@ -240,6 +245,15 @@ data:
- k8s_observer
- zpages
pipelines:
logs/entities:
exporters:
- otlphttp/entities
processors:
- memory_limiter
- batch
- resourcedetection
receivers:
- nop
metrics:
exporters:
- signalfx
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: 5a39391fc66bd7214fec8a5c9a3da45906a1c3452d0486e6f8237a0b39b001a3
checksum/config: b506fcb2eda95e2613d376d65e49f1d5539018515b2046dd3cd8b04fc3597c88
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ data:
endpoint: default-splunk-otel-collector:4317
tls:
insecure: true
otlphttp/entities:
headers:
X-SF-Token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event
signalfx:
access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
api_url: http://default-splunk-otel-collector:6060
Expand Down Expand Up @@ -138,6 +142,7 @@ data:
- container
- pod
- node
nop: null
otlp:
protocols:
grpc:
Expand Down Expand Up @@ -226,6 +231,15 @@ data:
- k8s_observer
- zpages
pipelines:
logs/entities:
exporters:
- otlphttp/entities
processors:
- memory_limiter
- batch
- resourcedetection
receivers:
- nop
metrics:
exporters:
- otlp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: a5a0800df4928794d4d1d98c1eb38802a511500837f1dc3b61ba6119c1ed91a2
checksum/config: eb7a4cf01962cb23d26c6068d188218df86c4c6d333c14f55b5286a4ffe09fd4
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ metadata:
data:
relay: |
exporters:
otlphttp/entities:
headers:
X-SF-Token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event
sapm:
access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace
Expand Down Expand Up @@ -157,6 +161,7 @@ data:
- container
- pod
- node
nop: null
otlp:
protocols:
grpc:
Expand Down Expand Up @@ -270,6 +275,15 @@ data:
- k8s_observer
- zpages
pipelines:
logs/entities:
exporters:
- otlphttp/entities
processors:
- memory_limiter
- batch
- resourcedetection
receivers:
- nop
metrics:
exporters:
- signalfx
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: d9741aa91358b9a172f276787e302ced538c6a42ddc05bf2ed68e46a4012193c
checksum/config: e666e7b4bc423939ae2ef5242a56a968b6afcbed3132ee3e2447ac682e9b8338
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down
Loading

0 comments on commit 952821e

Please sign in to comment.