Skip to content

Commit 9e5f856

Browse files
chore(agentType): revert change (#2566)
1 parent cb89da2 commit 9e5f856

4 files changed

Lines changed: 69 additions & 70 deletions

File tree

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
Unreleased section should follow [Release Toolkit](https://github.com/newrelic/release-toolkit/blob/main/README.md).
88

9+
Remember that the keywords that you can use are the following:
10+
- breaking => Major
11+
- security => Minor
12+
- enhancement => Minor
13+
- bugfix => Patch
14+
915
## Unreleased
1016

1117
### bugfix
1218

1319
- Add DaemonSet health-check in pipeline-control-gateway-config Agent Type
20+
- pcg_config: revert agentType config
1421

1522
## v1.15.1 - 2026-05-26
1623

agent-control/agent-type-registry/newrelic/pipeline-control-gateway-config-0.1.0.yaml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@ name: com.newrelic.pipeline_control_gateway_config
33
version: 0.1.0
44
variables:
55
k8s:
6-
chart_values:
7-
gateway:
8-
generated:
9-
description: "OTel Collector configuration for the Pipeline Control Gateway"
10-
type: yaml
11-
required: true
6+
config:
7+
description: "OTel Collector configuration for the Pipeline Control Gateway"
8+
type: yaml
9+
required: true
1210
config_map_name:
1311
description: "Name of the ConfigMap that AC creates and PCG mounts as its configuration source"
1412
type: string
@@ -51,7 +49,7 @@ deployment:
5149
namespace: ${nr-ac:namespace_agents}
5250
data:
5351
deployment-config.yaml: |
54-
${nr-var:chart_values.gateway.generated}
52+
${nr-var:config}
5553
# This is required as it is also defined in:
5654
# https://github.com/newrelic/helm-charts/blob/8c3b88bdf03e600aec8a5d94bab80635b4eec671/charts/pipeline-control-gateway/templates/deployment-configmap.yaml#L7
5755
gateway-config.yaml: |

agent-control/src/agent_type/definition/agent_type_validation_tests.rs

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -561,29 +561,25 @@ static AGENT_TYPE_PIPELINE_CONTROL_GATEWAY_CONFIG: LazyLock<AgentTypeValuesTestC
561561
(
562562
"mandatory fields only",
563563
r#"
564-
chart_values:
565-
gateway:
566-
generated:
567-
receivers:
564+
config:
565+
receivers:
568566
otlp: {}
569567
"#,
570568
),
571569
(
572570
"check all value types are correct",
573571
r#"
574-
chart_values:
575-
gateway:
576-
generated:
577-
receivers:
572+
config:
573+
receivers:
578574
otlp: {}
579-
exporters:
575+
exporters:
580576
otlp:
581-
endpoint: "otlp.nr-data.net:4317"
582-
service:
577+
endpoint: "otlp.nr-data.net:4317"
578+
service:
583579
pipelines:
584-
traces:
585-
receivers: [otlp]
586-
exporters: [otlp]
580+
traces:
581+
receivers: [otlp]
582+
exporters: [otlp]
587583
config_map_name: "my-otel-config"
588584
"#,
589585
),

test/k8s-e2e/configmap-agent/ac-values-configmap-agent.yml

Lines changed: 47 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -18,55 +18,53 @@ image:
1818
# TODO: On mac serde is not parsing well yaml values directly and only works well with strings we should check our templating system.
1919
agentsConfig:
2020
gateway:
21-
chart_values:
22-
gateway:
23-
generated:
24-
exporters:
25-
otlp/exporter:
26-
endpoint: https://otlp.nr-data.net:443
27-
headers:
28-
api-key: ${env:NEW_RELIC_LICENSE_KEY}
29-
extensions:
30-
healthcheckv2:
31-
component_health:
32-
include_permanent_errors: false
33-
include_recoverable_errors: true
34-
recovery_duration: 5m
35-
http:
36-
config:
37-
enabled: true
38-
path: /health/config
39-
endpoint: ${env:MY_POD_IP}:13133
40-
status:
41-
enabled: true
42-
path: /health/status
43-
use_v2: true
44-
zpages: { }
45-
processors:
46-
filter/Metrics: null
47-
receivers:
48-
otlp/receiver:
49-
protocols:
50-
grpc:
51-
endpoint: ${env:MY_POD_IP}:4317
52-
http:
53-
endpoint: ${env:MY_POD_IP}:4318
54-
service:
55-
extensions:
56-
- healthcheckv2
57-
pipelines:
58-
metrics/otlp:
59-
exporters:
60-
- otlp/exporter
61-
processors:
62-
- filter/Metrics
63-
receivers:
64-
- otlp/receiver
65-
telemetry:
66-
logs:
67-
level: info
68-
metrics:
69-
level: detailed
21+
config:
22+
exporters:
23+
otlp/exporter:
24+
endpoint: https://otlp.nr-data.net:443
25+
headers:
26+
api-key: ${env:NEW_RELIC_LICENSE_KEY}
27+
extensions:
28+
healthcheckv2:
29+
component_health:
30+
include_permanent_errors: false
31+
include_recoverable_errors: true
32+
recovery_duration: 5m
33+
http:
34+
config:
35+
enabled: true
36+
path: /health/config
37+
endpoint: ${env:MY_POD_IP}:13133
38+
status:
39+
enabled: true
40+
path: /health/status
41+
use_v2: true
42+
zpages: { }
43+
processors:
44+
filter/Metrics: null
45+
receivers:
46+
otlp/receiver:
47+
protocols:
48+
grpc:
49+
endpoint: ${env:MY_POD_IP}:4317
50+
http:
51+
endpoint: ${env:MY_POD_IP}:4318
52+
service:
53+
extensions:
54+
- healthcheckv2
55+
pipelines:
56+
metrics/otlp:
57+
exporters:
58+
- otlp/exporter
59+
processors:
60+
- filter/Metrics
61+
receivers:
62+
- otlp/receiver
63+
telemetry:
64+
logs:
65+
level: info
66+
metrics:
67+
level: detailed
7068
config_map_name: "pcg-otel-config"
7169
systemIdentity:
7270
create: false

0 commit comments

Comments
 (0)