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

Metrics: Add Prometheus Job Information #3082

Merged
merged 5 commits into from
Oct 2, 2018
Merged

Metrics: Add Prometheus Job Information #3082

merged 5 commits into from
Oct 2, 2018

Conversation

nwmac
Copy link
Contributor

@nwmac nwmac commented Sep 28, 2018

Improves the display of which endpoints a metrics endpoint provides metrics for.

Added job name and status from Prometheus

@nwmac nwmac self-assigned this Sep 28, 2018
@cfdreddbot
Copy link

Hey nwmac!

Thanks for submitting this pull request! I'm here to inform the recipients of the pull request that you and the commit authors have already signed the CLA.

@codecov
Copy link

codecov bot commented Sep 28, 2018

Codecov Report

Merging #3082 into v2-master will decrease coverage by 0.05%.
The diff coverage is 80.68%.

@@              Coverage Diff              @@
##           v2-master    #3082      +/-   ##
=============================================
- Coverage      71.01%   70.96%   -0.06%     
=============================================
  Files            607      608       +1     
  Lines          26258    26321      +63     
  Branches        5940     5948       +8     
=============================================
+ Hits           18648    18678      +30     
- Misses          7610     7643      +33

filter(a => !!a),
map((targetsData: any) => {
const mapped = {};
if (targetsData.activeTargets) {
Copy link
Contributor

Choose a reason for hiding this comment

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

This is targetsData.data.activeTargets in latest metrics branch, not sure if it's an issue yet on v2-master

Copy link
Contributor

@richard-cox richard-cox left a comment

Choose a reason for hiding this comment

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

LGTM - Against v2-master this PR all works fine so we're good to merge. However we'll need to tweak this when the latest metrics (charts and cells) PRs merge

  • FetchMetricsAction will need to be updated due to the change in MetricsActions
  • The format of the metrics response seems to have changed, so metrics.component.ts targetsData.activeTargets changed to targetsData.data.activeTargets

@richard-cox richard-cox requested a review from KlapTrap October 2, 2018 11:11
@KlapTrap KlapTrap merged commit 3d2d67b into v2-master Oct 2, 2018
@KlapTrap KlapTrap deleted the metrics-info branch October 2, 2018 12:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants