Skip to content
Snippets Groups Projects

Prometheus monitoring for GitLab Pages

Merged Zeger-Jan van de Weg requested to merge zj-prometheus into master
All threads resolved!

This starts of the prometheus monitoring for GitLab Pages, and fixes #42 (closed)

Point to check:

  • Are the metric names good, keeping Prometheus' conventions in mind?
  • Golang, general style etc
  • Shouldn't I do some voodoo magic to import this in the library?

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • added 1 commit

    • f0f6b386 - Add packages with govendor add +e

    Compare with previous version

  • added 1 commit

    • 035da1c9 - Add imports

    Compare with previous version

  • Author Developer

    Example metrics:

    # HELP gitlab_pages_domains_served_total The total number of sites served by this Pages app
    # TYPE gitlab_pages_domains_served_total gauge
    gitlab_pages_domains_served_total 7
    # HELP gitlab_pages_domains_updated_total The total number of site updates processed since daemon start
    # TYPE gitlab_pages_domains_updated_total counter
    gitlab_pages_domains_updated_total 1
    # HELP gitlab_pages_http_requests_total Total number of HTTP requests done serving
    # TYPE gitlab_pages_http_requests_total counter
    gitlab_pages_http_requests_total{code="302",method="GET"} 1
    gitlab_pages_http_requests_total{code="404",method="GET"} 2
    # HELP gitlab_pages_http_sessions_active The number of HTTP requests currently being processed
    # TYPE gitlab_pages_http_sessions_active gauge
    gitlab_pages_http_sessions_active 0
    # HELP gitlab_pages_last_domain_update_seconds Seconds since Unix Epoc to the last update for all domains served
    # TYPE gitlab_pages_last_domain_update_seconds counter
    gitlab_pages_last_domain_update_seconds 1.485509286e+09
  • added 1 commit

    • da4bdc68 - Prometheus monitoring for GitLab Pages

    Compare with previous version

  • Stan Hu
  • added 1 commit

    • 1e31fac9 - Prometheus monitoring for GitLab Pages

    Compare with previous version

  • added 1 commit

    • 85cab110 - Improve complexity

    Compare with previous version

  • added 1 commit

    • 6df60e27 - Improve complexity metrics

    Compare with previous version

  • added 1 commit

    • 8a4f5c1e - Keep using golang v1.5.4 for now

    Compare with previous version

  • added 1 commit

    • 44cc9b13 - Improve complexity metrics

    Compare with previous version

  • added 1 commit

    • 76f8fdf8 - Fix dependencies

    Compare with previous version

  • added 1 commit

    • d4a4bab2 - Fix dependencies

    Compare with previous version

  • Nick Thomas
  • Nick Thomas added 2 commits

    added 2 commits

    • 1c53d534 - Reduce the cyclomatic complexity of appMain()
    • 45f8c120 - Revert changes to handling sockets in appMain

    Compare with previous version

  • Nick Thomas
  • added 1 commit

    • 19c147ec - Add Readme and remove unneeded log

    Compare with previous version

  • @zj with a few minor changes and a rebase / squash to get rid of the back-and-forth in the commits, I think this can be merged. Good work 👍

  • added 1 commit

    Compare with previous version

  • Author Developer

    @nick.thomas Rebased, left with 2 commits. Let me know what you think

  • Nick Thomas resolved all discussions

    resolved all discussions

  • LGTM 👍

  • Nick Thomas mentioned in commit eae671b2

    mentioned in commit eae671b2

  • merged

  • @zj is this also configurable in Omnibus or not yet? Thanks :)

  • Author Developer

    @axil Good catch. Not yet. @marin do you have some pointers for me to go on? Or could the build team pick this up?

  • @zj Do you have some pointers for me what too look at in this MR? Diff is 'uge.

  • Author Developer

    Sorry about that, thats true. Didn't realise that. Anyway, in main.go I've declared a new flag to pass an address to the daemon to expose the metrics. Found here

    Anyway, I found already how omnibus tries to handle these flags so I might just give this a whirl myself monday. :)

  • Great!

  • Author Developer

    For cross linking: omnibus-gitlab!1300 (merged)

  • Please register or sign in to reply
    Loading