Skip to content
GitLab Next
  • Menu
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • 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 1
    • Merge requests 1
  • 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.orgGitLab.org
  • GitLab FOSSGitLab FOSS
  • Merge requests
  • !8935

Added Prometheus Service and Prometheus graphs

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Kamil Trzciński | OoO 2022.07.23 till 2022.08.20 requested to merge prometheus-monitoring into master Feb 02, 2017
  • 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