Skip to content

Commit b38961a

Browse files
author
James Belchamber
committed
Re-adding otel-collector-config.yaml and conditionally deploying it if one is not provided
1 parent c24226b commit b38961a

File tree

3 files changed

+63
-3
lines changed

3 files changed

+63
-3
lines changed

gcp/secret-manager.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ resource "google_secret_manager_secret" "opentelemetry_configuration" {
3131

3232
resource "google_secret_manager_secret_version" "opentelemetry_configuration" {
3333
secret = google_secret_manager_secret.opentelemetry_configuration.id
34-
secret_data = base64decode(var.otelcol_config_b64)
34+
secret_data = var.otelcol_config_b64 == "INTERNAL" ? file("../otel-collector-config.yaml") : base64decode(var.otelcol_config_b64)
3535
}
3636

3737
resource "google_secret_manager_secret_iam_binding" "opentelemetry_configuration" {

gcp/variables.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ variable "otelcol_image_version" {
5252
variable "otelcol_config_b64" {
5353
description = "A configuration file for the OpenTelemetry Collector, encoded in base64"
5454
type = string
55-
default = "cmVjZWl2ZXJzOgogIG90bHA6CiAgICBwcm90b2NvbHM6CiAgICAgIGdycGM6CiAgICAgICAgZW5kcG9pbnQ6IGxvY2FsaG9zdDo0MzE3CiAgaG9zdG1ldHJpY3M6CiAgICBjb2xsZWN0aW9uX2ludGVydmFsOiAxMHMKICAgIHNjcmFwZXJzOgogICAgICBwYWdpbmc6CiAgICAgICAgbWV0cmljczoKICAgICAgICAgIHN5c3RlbS5wYWdpbmcudXRpbGl6YXRpb246CiAgICAgICAgICAgIGVuYWJsZWQ6IHRydWUKICAgICAgY3B1OgogICAgICAgIG1ldHJpY3M6CiAgICAgICAgICBzeXN0ZW0uY3B1LnV0aWxpemF0aW9uOgogICAgICAgICAgICBlbmFibGVkOiB0cnVlCiAgICAgIGRpc2s6CiAgICAgIGZpbGVzeXN0ZW06CiAgICAgICAgbWV0cmljczoKICAgICAgICAgIHN5c3RlbS5maWxlc3lzdGVtLnV0aWxpemF0aW9uOgogICAgICAgICAgICBlbmFibGVkOiB0cnVlCiAgICAgIGxvYWQ6CiAgICAgIG1lbW9yeToKICAgICAgbmV0d29yazoKICAgICAgcHJvY2Vzc2VzOgoKcHJvY2Vzc29yczoKICBiYXRjaDoKICAgIHNlbmRfYmF0Y2hfbWF4X3NpemU6IDEwMAogICAgc2VuZF9iYXRjaF9zaXplOiAxMAogICAgdGltZW91dDogMTBzCiAgYXR0cmlidXRlcy9kZDoKICAgIGFjdGlvbnM6CiAgICAgIC0ga2V5OiBlbnYKICAgICAgICBhY3Rpb246IGluc2VydAogICAgICAgIHZhbHVlOiAke2VudjpERF9FTlZfTkFNRX0KCmV4cG9ydGVyczoKICBkYXRhZG9nOgogICAgYXBpOgogICAgICBzaXRlOiAke2VudjpERF9TSVRFfQogICAgICBrZXk6ICR7ZW52OkREX0FQSV9LRVl9CiAgICBob3N0X21ldGFkYXRhOgogICAgICB0YWdzOgogICAgICAgIC0gcmVhbG06JHtlbnY6UkVBTE1fSUR9CgpzZXJ2aWNlOgogIHBpcGVsaW5lczoKICAgIG1ldHJpY3M6CiAgICAgIHJlY2VpdmVyczogW2hvc3RtZXRyaWNzLCBvdGxwXQogICAgICBwcm9jZXNzb3JzOiBbYXR0cmlidXRlcy9kZCxiYXRjaF0KICAgICAgZXhwb3J0ZXJzOiBbZGF0YWRvZ10KICAgIHRyYWNlczoKICAgICAgcmVjZWl2ZXJzOiBbb3RscF0KICAgICAgcHJvY2Vzc29yczogW2F0dHJpYnV0ZXMvZGQsYmF0Y2hdCiAgICAgIGV4cG9ydGVyczogW2RhdGFkb2ddCiAgICBsb2dzOgogICAgICByZWNlaXZlcnM6IFtvdGxwXQogICAgICBwcm9jZXNzb3JzOiBbYXR0cmlidXRlcy9kZCxiYXRjaF0KICAgICAgZXhwb3J0ZXJzOiBbZGF0YWRvZ10K"
56-
# This is a base64 representation of ../otel-collector-config.yaml
55+
default = "INTERNAL"
56+
# This default is captured in secret-manager.tf to deploy ../otel-collector-config.yaml from this repository.
5757
}
5858

5959
variable "otelcol_vars" {

otel-collector-config.yaml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
receivers:
2+
otlp:
3+
protocols:
4+
grpc:
5+
endpoint: localhost:4317
6+
hostmetrics:
7+
collection_interval: 10s
8+
scrapers:
9+
paging:
10+
metrics:
11+
system.paging.utilization:
12+
enabled: true
13+
cpu:
14+
metrics:
15+
system.cpu.utilization:
16+
enabled: true
17+
disk:
18+
filesystem:
19+
metrics:
20+
system.filesystem.utilization:
21+
enabled: true
22+
load:
23+
memory:
24+
network:
25+
processes:
26+
27+
processors:
28+
batch:
29+
send_batch_max_size: 100
30+
send_batch_size: 10
31+
timeout: 10s
32+
attributes/dd:
33+
actions:
34+
- key: env
35+
action: insert
36+
value: ${env:DD_ENV_NAME}
37+
38+
exporters:
39+
datadog:
40+
api:
41+
site: ${env:DD_SITE}
42+
key: ${env:DD_API_KEY}
43+
host_metadata:
44+
tags:
45+
- realm:${env:REALM_ID}
46+
47+
service:
48+
pipelines:
49+
metrics:
50+
receivers: [hostmetrics, otlp]
51+
processors: [attributes/dd,batch]
52+
exporters: [datadog]
53+
traces:
54+
receivers: [otlp]
55+
processors: [attributes/dd,batch]
56+
exporters: [datadog]
57+
logs:
58+
receivers: [otlp]
59+
processors: [attributes/dd,batch]
60+
exporters: [datadog]

0 commit comments

Comments
 (0)