Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Tanzu Tile] Add host.name resource attribute #5810

Merged
merged 1 commit into from
Jan 21, 2025
Merged

[Tanzu Tile] Add host.name resource attribute #5810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions deployments/cloudfoundry/bosh/DEVELOPMENT.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ If no configuration file is provided, a template file will be populated using th

Required Properties:

- `cloudfoundry.deployment.hostname`
- `cloudfoundry.rlp_gateway.endpoint`
- `cloudfoundry.uaa.endpoint`
- `cloudfoundry.uaa.password`
Expand Down
3 changes: 3 additions & 0 deletions deployments/cloudfoundry/bosh/jobs/splunk-otel-collector/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ properties:
description: "The Splunk realm in which your organization resides -- used to derive splunk.ingest_url and splunk.api_url if those are not provided"
required: false

cloudfoundry.director.hostname:
description: "The hostname of the Cloud Foundry BOSH director"

cloudfoundry.rlp_gateway.endpoint:
description: "The URL of the RLP Gateway that acts as a proxy for the firehose"

Expand Down
9 changes: 6 additions & 3 deletions ...nts/cloudfoundry/bosh/jobs/splunk-otel-collector/templates/otel-collector-config.yaml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,11 @@ receivers:
<% end %>

processors:
resourcedetection:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we somehow test this file so it doesn't get stale like it did here?

Copy link
Contributor Author

@crobert-1 crobert-1 Jan 17, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There isn't a quick way to test this automatically. Running a BOSH deployment requires a lot of set up and dependency installs, so it'd be some amount of effort. This file doesn't get changed much and is tested directly with each Tanzu Tile release.

The change to the config here is a bug fix, it didn't actually go stale.

Edit: I can definitely see there being value in adding CI/CD testing for this, my main point is that it would be its own task to track, outside of the scope of this change.

detectors: [system]
resource:
attributes:
- key: host.name
value: <%= p('cloudfoundry.director.hostname') %>
action: upsert

exporters:
signalfx:
Expand All @@ -43,6 +46,6 @@ service:
pipelines:
metrics:
receivers: [cloudfoundry]
processors: [resourcedetection]
processors: [resource]
exporters: [signalfx]
<% end %>
2 changes: 2 additions & 0 deletions deployments/cloudfoundry/tile/tile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ packages:
release: splunk-otel-collector
properties:
cloudfoundry:
director:
hostname: (( $director.hostname ))
rlp_gateway:
endpoint: https://log-stream.(( ..cf.cloud_controller.system_domain.value ))
shard_id: (( .properties.cloudfoundry_rlp_gateway_shard_id.value ))
Expand Down