forked from GoogleContainerTools/kpt-config-sync
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bump otelcontribcol version to v0.106.0-gke.2 (GoogleContainerTools#1369
) To upgrade to otelcontribcol 0.106.0 we need to mitigate two breaking changes in https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.104.0. The opencensus receiver depends on 0.0.0.0 so disabling feature gate component.UseLocalHostAsDefaultHost. With style `$FOO` deprecation, all env vars are changed to match the style. This brings a problem in the otel-agent container start when reconciler-manager and resource-group-controller do not initialize the following env vars: - `configsync_sync_kind` - `configsync_sync_name` - `configsync_sync_namespace` So splitting the otel-agent config between the reconciler and controllers.
- Loading branch information
1 parent
3de9783
commit 91e1b14
Showing
8 changed files
with
80 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
# Copyright 2024 Google LLC | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
apiVersion: v1 | ||
kind: ConfigMap | ||
metadata: | ||
name: otel-agent-reconciler | ||
namespace: config-management-system | ||
labels: | ||
app: opentelemetry | ||
component: otel-agent | ||
configmanagement.gke.io/system: "true" | ||
configmanagement.gke.io/arch: "csmr" | ||
data: | ||
otel-agent-reconciler-config.yaml: | | ||
receivers: | ||
opencensus: | ||
exporters: | ||
opencensus: | ||
endpoint: otel-collector.config-management-monitoring:55678 | ||
tls: | ||
insecure: true | ||
processors: | ||
# Attributes processor adds custom configsync metric labels to applicable | ||
# metrics to identify the sync object used to configure this deployment. | ||
# | ||
# Note: configsync.sync.generation is explicitly excluded here, because it | ||
# is high cardinality. So we don't want to send it as a label, only as a | ||
# resource attribute. That way it's only propagated to Prometheus, and not | ||
# Monarch or Cloud Monitoring, which ignore custom resource attributes. | ||
attributes: | ||
actions: | ||
- key: configsync.sync.kind | ||
action: upsert | ||
value: ${CONFIGSYNC_SYNC_KIND} | ||
- key: configsync.sync.name | ||
action: upsert | ||
value: ${CONFIGSYNC_SYNC_NAME} | ||
- key: configsync.sync.namespace | ||
action: upsert | ||
value: ${CONFIGSYNC_SYNC_NAMESPACE} | ||
batch: | ||
# Populate resource attributes from OTEL_RESOURCE_ATTRIBUTES env var and | ||
# the GCE metadata service, if available. | ||
resourcedetection: | ||
detectors: [env, gcp] | ||
extensions: | ||
health_check: | ||
service: | ||
extensions: [health_check] | ||
pipelines: | ||
metrics: | ||
receivers: [opencensus] | ||
processors: [batch, resourcedetection, attributes] | ||
exporters: [opencensus] | ||
telemetry: | ||
logs: | ||
level: "INFO" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters