Skip to content

Include upgrader version in metrics and inventory#35188

Merged
zmb3 merged 12 commits intomasterfrom
bernard/upgrader-version-metrics
Dec 5, 2023
Merged

Include upgrader version in metrics and inventory#35188
zmb3 merged 12 commits intomasterfrom
bernard/upgrader-version-metrics

Conversation

@bernardjkim
Copy link
Copy Markdown
Contributor

@bernardjkim bernardjkim commented Nov 30, 2023 •
edited
Loading

Supports https://github.com/gravitational/cloud/issues/6773

Once the teleport-updater patch is released #35150, users will need a way to identify which agents are running the patch.

Teleport agents will now read the version of the teleport-upgrader from the TELEPORT_EXT_UPGRADER_VERSION env variable. This value is then included in the agent heartbeats.

Auth will include the teleport-upgrader version in prometheus metrics and the inventory.

The teleport_upgrader_counts metric will now include the version label to indicate the version of the teleport-upgrader.

The tctl inventory ls command will now display the teleport-upgrader version. Older versions of the teleport-upgrader will report a none version.

$ tctl inventory ls
Server ID                            Hostname          Services Agent Version Upgrader Upgrader Version
------------------------------------ ----------------- -------- ------------- -------- ----------------
4fb2d97d-884a-4566-b477-c805d477df09 agent.example.com Node     v1.2.3        unit     none
4fb2d97d-884a-4566-b477-c805d477df10 agent.example.com Node     v1.2.3        unit     v14.2.0
...

changelog: Include upgrader version in metrics and inventory

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Nov 30, 2023

🤖 Vercel preview here: https://docs-2th0w3hlz-goteleport.vercel.app/docs/ver/preview

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Nov 30, 2023

🤖 Vercel preview here: https://docs-9loml0qm1-goteleport.vercel.app/docs/ver/preview

@bernardjkim bernardjkim force-pushed the bernard/upgrader-version-metrics branch from 32e1c02 to 7bc4c49 Compare December 1, 2023 17:11
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Dec 1, 2023

🤖 Vercel preview here: https://docs-n5l123hfj-goteleport.vercel.app/docs/ver/preview

@bernardjkim bernardjkim marked this pull request as ready for review December 1, 2023 17:34
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Dec 1, 2023

The PR changelog entry failed validation: Changelog entry not found in the PR body. Please add a "no-changelog" label to the PR, or changelog lines starting with changelog: followed by the changelog entries for the PR.

@github-actions github-actions Bot added documentation helm size/md tctl tctl - Teleport admin tool labels Dec 1, 2023
@bernardjkim bernardjkim removed the request for review from marcoandredinis December 1, 2023 17:35
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Dec 5, 2023

The PR changelog entry failed validation: Changelog entry not found in the PR body. Please add a "no-changelog" label to the PR, or changelog lines starting with changelog: followed by the changelog entries for the PR.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Dec 5, 2023

The PR changelog entry failed validation: Changelog entry not found in the PR body. Please add a "no-changelog" label to the PR, or changelog lines starting with changelog: followed by the changelog entries for the PR.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Dec 5, 2023

🤖 Vercel preview here: https://docs-68rj4cyhv-goteleport.vercel.app/docs/ver/preview

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Dec 5, 2023

🤖 Vercel preview here: https://docs-1w09tyg0d-goteleport.vercel.app/docs/ver/preview

marcoandredinis
marcoandredinis approved these changes Dec 5, 2023
View reviewed changes
Comment thread lib/automaticupgrades/config.go Outdated
@bernardjkim @marcoandredinis
Update lib/automaticupgrades/config.go
dca4f8d 
Co-authored-by: Marco André Dinis <marco.dinis@goteleport.com>
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Dec 5, 2023

🤖 Vercel preview here: https://docs-8k2qi1ola-goteleport.vercel.app/docs/ver/preview

@bernardjkim bernardjkim added this pull request to the merge queue Dec 5, 2023
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Dec 5, 2023
@zmb3 zmb3 added this pull request to the merge queue Dec 5, 2023
Merged via the queue into master with commit 6a7369d Dec 5, 2023
@zmb3 zmb3 deleted the bernard/upgrader-version-metrics branch December 5, 2023 19:38
@public-teleport-github-review-bot
Copy link
Copy Markdown

public-teleport-github-review-bot Bot commented Dec 5, 2023

@bernardjkim See the table below for backport results.

Branch Result
branch/v13 Failed
branch/v14 Failed

bernardjkim added a commit that referenced this pull request Dec 5, 2023
@bernardjkim @marcoandredinis
Include upgrader version in metrics and inventory (#35188)
6945948 
* Add external upgrader version to proto message

* Inlcude upgrader version in metrics and inventory

* Include TELEPORT_EXT_UPGRADER_VERSION in deployment

* whitespace

* Include upgrader version in inventory ls

* Small docs change

* Use teleport-upgrade version if available

* Normalize version

* Address feedback

* Revert e

* Update lib/automaticupgrades/config.go

Co-authored-by: Marco André Dinis <marco.dinis@goteleport.com>

---------

Co-authored-by: Marco André Dinis <marco.dinis@goteleport.com>
@bernardjkim bernardjkim mentioned this pull request Dec 5, 2023
Merged
bernardjkim added a commit that referenced this pull request Dec 5, 2023
@bernardjkim @marcoandredinis
Include upgrader version in metrics and inventory (#35188)
c67539b 
* Add external upgrader version to proto message

* Inlcude upgrader version in metrics and inventory

* Include TELEPORT_EXT_UPGRADER_VERSION in deployment

* whitespace

* Include upgrader version in inventory ls

* Small docs change

* Use teleport-upgrade version if available

* Normalize version

* Address feedback

* Revert e

* Update lib/automaticupgrades/config.go

Co-authored-by: Marco André Dinis <marco.dinis@goteleport.com>

---------

Co-authored-by: Marco André Dinis <marco.dinis@goteleport.com>
@bernardjkim bernardjkim mentioned this pull request Dec 5, 2023
Merged
github-merge-queue Bot pushed a commit that referenced this pull request Dec 6, 2023
@bernardjkim @marcoandredinis
Include upgrader version in metrics and inventory (#35188) (#35380)
a6b8e2f 
* Add external upgrader version to proto message

* Inlcude upgrader version in metrics and inventory

* Include TELEPORT_EXT_UPGRADER_VERSION in deployment

* whitespace

* Include upgrader version in inventory ls

* Small docs change

* Use teleport-upgrade version if available

* Normalize version

* Address feedback

* Revert e

* Update lib/automaticupgrades/config.go



---------

Co-authored-by: Marco André Dinis <marco.dinis@goteleport.com>
github-merge-queue Bot pushed a commit that referenced this pull request Dec 6, 2023
@bernardjkim @marcoandredinis
Include upgrader version in metrics and inventory (#35188) (#35381)
1a8d961 
* Add external upgrader version to proto message

* Inlcude upgrader version in metrics and inventory

* Include TELEPORT_EXT_UPGRADER_VERSION in deployment

* whitespace

* Include upgrader version in inventory ls

* Small docs change

* Use teleport-upgrade version if available

* Normalize version

* Address feedback

* Revert e

* Update lib/automaticupgrades/config.go



---------

Co-authored-by: Marco André Dinis <marco.dinis@goteleport.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@marcoandredinis marcoandredinis marcoandredinis approved these changes

@tigrato tigrato tigrato approved these changes

@fspmarshall fspmarshall fspmarshall approved these changes

Assignees

No one assigned

Labels

documentation helm size/md tctl tctl - Teleport admin tool

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@bernardjkim @marcoandredinis @tigrato @fspmarshall @zmb3