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.

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

Add support for the BMS monitored resource to the Prometheus receiver #1471

Merged
merged 9 commits into from Dec 5, 2023

Conversation

ghost
Copy link

@ghost ghost commented Oct 18, 2023

Description

The PR adds support for the BMS monitored resource to the Prometheus receiver.

Related issue

b/266788401, b/267347168

How has this been tested?

Manually tested on the test BMS machine using the following steps:

  1. Ran the json_exporter on the test BMS machine following this guide
  2. Compiled the google_cloud_ops_agent_engine binary and placed it into /opt/google-cloud-ops-agent/libexec/google_cloud_ops_agent_engine on the test BMS machine and restarted the agent.
  3. Navigated to Pantheon to confirm that the metrics show up in the Metrics Explorer
    3govzhEWVAudkev (1)

Checklist:

  • Unit tests
    • Unit tests do not apply.
    • Unit tests have been added/modified and passed for this PR.
  • Integration tests
    • Integration tests do not apply.
    • Integration tests have been added/modified and passed for this PR.
  • Documentation
    • This PR introduces no user visible changes.
    • This PR introduces user visible changes and the corresponding documentation change has been made.
  • Minor version bump
    • This PR introduces no new features.
    • This PR introduces new features, and there is a separate PR to bump the minor version since the last release already.
    • This PR bumps the version.

confgenerator/prometheus.go Outdated Show resolved Hide resolved
confgenerator/prometheus.go Outdated Show resolved Hide resolved
confgenerator/resourcedetector/bms_detector.go Outdated Show resolved Hide resolved
VERSION Outdated Show resolved Hide resolved
@ghost
Copy link
Author

ghost commented Nov 8, 2023

@igorpeshansky I apologize but seems like I accidentally synced my fork with upstream using the github UI, which resulted in the inclusion of some changes from the master branch.

@igorpeshansky
Copy link
Member

igorpeshansky commented Nov 8, 2023

We should be able to merge those changes into the target branch (bms-support) as well. Or you could undo the merge and force-push. Let me know which you prefer.

@igorpeshansky igorpeshansky changed the base branch from bms-support to master November 8, 2023 22:03
@igorpeshansky igorpeshansky changed the base branch from master to bms-support November 8, 2023 22:03
@ghost
Copy link
Author

ghost commented Dec 1, 2023

It's all done. The merge conflict has been resolved. PTAL ?

Copy link
Member

@igorpeshansky igorpeshansky left a comment

Choose a reason for hiding this comment

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

LGTM :shipit:

@igorpeshansky igorpeshansky merged commit b0fc29f into GoogleCloudPlatform:bms-support Dec 5, 2023
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants