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

Jump to bottom

Add octopus server tag to all metrics, events, and logs #19318

Merged
merged 9 commits into from
Jan 8, 2025
Merged

Add octopus server tag to all metrics, events, and logs #19318

merged 9 commits into from
Jan 8, 2025

Conversation

sarah-witt
Copy link
Contributor

What does this PR do?

Adds octopus_server tag to all metrics, event, and logs

Motivation

help differentiate and tag if using multiple octopus servers

Review checklist (to be filled by reviewers)

  • Feature or bugfix MUST have appropriate tests (unit, integration, e2e)
  • Add the qa/skip-qa label if the PR doesn't need to be tested during QA.
  • If you need to backport this PR to another branch, you can add the backport/<branch-name> label to the PR and it will automatically open a backport PR once this one is merged

@codecov Codecov
Copy link

codecov bot commented Dec 27, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 89.36%. Comparing base (d215ee4) to head (16b4897).
Report is 1 commits behind head on sarah/add-octopus-integration.

Additional details and impacted files

@sarah-witt sarah-witt marked this pull request as ready for review December 27, 2024 15:52
@sarah-witt sarah-witt requested review from a team as code owners December 27, 2024 15:52
Base automatically changed from sarah/add-machines-metrics to sarah/add-octopus-integration January 8, 2025 15:55
@sarah-witt sarah-witt merged commit 84fb139 into sarah/add-octopus-integration Jan 8, 2025
12 checks passed
@sarah-witt sarah-witt deleted the sarah/add-octopus-server-tag branch January 8, 2025 16:13
github-merge-queue bot pushed a commit that referenced this pull request Jan 17, 2025
@sarah-witt @jose-manuel-almaza
[PLINT-469] Add Octopus Deploy integration (#18488)
5658647 
* Add scaffolding

* add link to readme

* clean up manifest

* validate ci

* validate models and config;

* add labeler

* remove dash

* fix manifest

* clean scaffolding and add base fixtures

* add base code and test

* fix changelog

* update and validate config

* add metric to check

* Add mocks and make true unit tests

* Add support for first level space autodiscovery

* Add support fot project groups discovery

* Add support for projects

* remove spaces discovery and add it as configuration option

* clean up code and tests

* move initializations to check init

* add support for task count metrics

* refactor to reference project_group

* submit project metrics in check method

* Add handle_error wrapper and add more logging

* bump python version

* Add e2e test

* lint

* add http template to config spec

* refactor test files and add caddy e2e

* lint

* fix tests

* Add deployment duration metric

* rename to seconds

* Add queue time metric

* Add deploy success metric

* Add can rerun metric

* add metric for has warnings or errors

* sort readme

* Sarah/add octopus server metrics (#18868)

* Add support for server node metrics

* add server node mocks

* remove task id tag

* update caddyfile

* remove dead code

* update codeowners

* add e2e lab and update config

* Address comments

* Update projects logic and refactor (#19087)

* Fix new deployment logic and support in progress and queued deployments

* sync metadata

* update caddyfile

* fix

* add to completed date

* Refactor

* fixed e2e tests

* fixed instance fixture

* fixed e2e test

* added some e2e asserts

* fixed lint error

* all metrics asserted

* Add test asserting metadata, add test and handle failure of tasks

* store base tags

* Don't report completed and executing metrics if no data

* Add support for octopus server node metrics

* remove unused constants

* validate

* lint

* update e2e

* update metadata

* Use project name and project group name tags

* Use space name instead of space id

* Update log lines

* update test instance

* Update metric description

---------

Co-authored-by: Jose Manuel Almaza <[email protected]>

* Make assertions more specific

* Add support for events (#19176)

* [PLINT-484]  Add support for deployment logs (#19152)

* Add support for deployment logs

* Add server node tag

* add e2e_metrics

* remove completed_time

* Address comments

* add extra assert

* [PLINT-469] Add support for pagination in octopus integration (#19228)

* Add support for pagination

* update caddyfile and remove unneeded args

* Apply suggestions

* update config docs (#19243)

* [PLINT-543] Add support for environment metrics and tagging by environment, deployment, and release (#19192)

* Add support for environment metrics

* Add config for autodiscovery

* Add support for environments via discovery

* Add environment, release, and deployment tags

* Add caching for environments, releases, and deployments

* add to caddyfile

* remove env fallback

* change environments cache to dictionary

* use tuple for deployment

* Add pagination for environments

* update caddyfile

* update environments config

* sync models

* Filter by environment

* only collect deploy tasks

* update caddyfile

* Add support for waiting, queued, executing metrics (#19291)

* support unified service tagging: (#19342)

* fix headers for new year

* [PLINT-542] Add machines metrics  (#19285)

* Add support for machine metrics

* add role tags

* change to startswith

* validate metadata

* Address comments

* Add octopus server tag to all metrics, events, and logs  (#19318)

* Add support for machine metrics

* add role tags

* change to startswith

* validate metadata

* Address comments

* Add octopus server tag

* Add collect_events option

* Update docs

* dont use future tense in config

---------

Co-authored-by: Jose Manuel Almaza <[email protected]>
github-actions bot pushed a commit that referenced this pull request Jan 17, 2025
@github-merge-queue
[PLINT-469] Add Octopus Deploy integration (#18488)
8f593cd 
* Add scaffolding

* add link to readme

* clean up manifest

* validate ci

* validate models and config;

* add labeler

* remove dash

* fix manifest

* clean scaffolding and add base fixtures

* add base code and test

* fix changelog

* update and validate config

* add metric to check

* Add mocks and make true unit tests

* Add support for first level space autodiscovery

* Add support fot project groups discovery

* Add support for projects

* remove spaces discovery and add it as configuration option

* clean up code and tests

* move initializations to check init

* add support for task count metrics

* refactor to reference project_group

* submit project metrics in check method

* Add handle_error wrapper and add more logging

* bump python version

* Add e2e test

* lint

* add http template to config spec

* refactor test files and add caddy e2e

* lint

* fix tests

* Add deployment duration metric

* rename to seconds

* Add queue time metric

* Add deploy success metric

* Add can rerun metric

* add metric for has warnings or errors

* sort readme

* Sarah/add octopus server metrics (#18868)

* Add support for server node metrics

* add server node mocks

* remove task id tag

* update caddyfile

* remove dead code

* update codeowners

* add e2e lab and update config

* Address comments

* Update projects logic and refactor (#19087)

* Fix new deployment logic and support in progress and queued deployments

* sync metadata

* update caddyfile

* fix

* add to completed date

* Refactor

* fixed e2e tests

* fixed instance fixture

* fixed e2e test

* added some e2e asserts

* fixed lint error

* all metrics asserted

* Add test asserting metadata, add test and handle failure of tasks

* store base tags

* Don't report completed and executing metrics if no data

* Add support for octopus server node metrics

* remove unused constants

* validate

* lint

* update e2e

* update metadata

* Use project name and project group name tags

* Use space name instead of space id

* Update log lines

* update test instance

* Update metric description

---------

Co-authored-by: Jose Manuel Almaza <[email protected]>

* Make assertions more specific

* Add support for events (#19176)

* [PLINT-484]  Add support for deployment logs (#19152)

* Add support for deployment logs

* Add server node tag

* add e2e_metrics

* remove completed_time

* Address comments

* add extra assert

* [PLINT-469] Add support for pagination in octopus integration (#19228)

* Add support for pagination

* update caddyfile and remove unneeded args

* Apply suggestions

* update config docs (#19243)

* [PLINT-543] Add support for environment metrics and tagging by environment, deployment, and release (#19192)

* Add support for environment metrics

* Add config for autodiscovery

* Add support for environments via discovery

* Add environment, release, and deployment tags

* Add caching for environments, releases, and deployments

* add to caddyfile

* remove env fallback

* change environments cache to dictionary

* use tuple for deployment

* Add pagination for environments

* update caddyfile

* update environments config

* sync models

* Filter by environment

* only collect deploy tasks

* update caddyfile

* Add support for waiting, queued, executing metrics (#19291)

* support unified service tagging: (#19342)

* fix headers for new year

* [PLINT-542] Add machines metrics  (#19285)

* Add support for machine metrics

* add role tags

* change to startswith

* validate metadata

* Address comments

* Add octopus server tag to all metrics, events, and logs  (#19318)

* Add support for machine metrics

* add role tags

* change to startswith

* validate metadata

* Address comments

* Add octopus server tag

* Add collect_events option

* Update docs

* dont use future tense in config

---------

Co-authored-by: Jose Manuel Almaza <[email protected]> 5658647
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NouemanKHAL NouemanKHAL NouemanKHAL approved these changes

Assignees
No one assigned
Labels
agent/review-requested ecosystems/review-requested product/review-requested
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@sarah-witt @NouemanKHAL