Skip to content

GitLab Next

    • GitLab: the DevOps platform
    • Explore GitLab
    • Install GitLab
    • How GitLab compares
    • Get started
    • GitLab docs
    • GitLab Learn
  • Pricing
  • Talk to an expert
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
    • Menu
    Projects Groups Snippets
  • Get a free trial
  • Sign up
  • Login
  • Sign in / Register
  • GitLab FOSS GitLab FOSS
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Issues 0
    • Issues 0
    • List
    • Boards
    • Service Desk
    • Milestones
    • Iterations
    • Requirements
  • Merge requests 0
    • Merge requests 0
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages & Registries
    • Packages & Registries
    • Package Registry
    • Container Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Metrics
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • Code review
    • Insights
    • Issue
    • Repository
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Commits
  • Issue Boards
Collapse sidebar

GitLab 15.0 is launching on May 22! This version brings many exciting improvements, but also removes deprecated features and introduces breaking changes that may impact your workflow. To see what is being deprecated and removed, please visit Breaking changes in 15.0 and Deprecations.

  • GitLab.org
  • GitLab FOSSGitLab FOSS
  • Merge requests
  • !8935
"config/prometheus/additional_metrics.yml" did not exist on "master"
Merged
Created Feb 02, 2017 by Kamil Trzciński@ayufan🔴Maintainer0 of 9 tasks completed0/9 tasks
  • Review changes

  • Download
  • Email patches
  • Plain diff

Added Prometheus Service and Prometheus graphs

  • Overview 46
  • Commits 42
  • Pipelines 27
  • Changes 30

What does this MR do?

Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/26910

This MR adds a Prometheus Service, with support for fetching metrics for an environment and displaying that on environments page.

We miss actual data fetching, but this is a placeholder that can be used to be worked on.

Are there points in the code the reviewer needs to double check?

Why was this MR needed?

Screenshots (if relevant)

prom-ux.mov

Does this MR meet the acceptance criteria?

  • Changelog entry added
  • Documentation created/updated
  • API support added
  • Tests
    • Added for this feature/bug
    • All builds are passing
  • Conform by the merge request performance guides
  • Conform by the style guides
  • Branch has no merge conflicts with master (if it does - rebase it please)
  • Squashed related commits together

What are the relevant issue numbers?

Functionality Notes

Kamil: Please, edit queries and @jivanvl can add graphs to metrics action of environments_controller, as part of my MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8935

Kamil: For development make sure to have sidekiq running as the data is fetched in the background, API can return the http status code 204 it means that the data is not yet ready, retry with some delay if that happens. In normal circumstances you will receive a 200 http status code with the JSON status: true

Josh: I spun up a prometheus server outside of the omnibus package, here: https://kubeprom.35.185.3.210.nip.io/graph. This one has the k8s metrics we want to use for this.

\cc @joshlambert @ayufan

Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: prometheus-monitoring