Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

PrivateStorageio
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

14267828

Commit 14267828 authored 3 years ago by Jean-Paul Calderone

Downloads
- Plain Diff

Merge branch 'develop' into 'staging'

merge develop into staging

See merge request !148

parents 1d7f9947 60e19f7d

Branches

No related tags found

Loading

Checking pipeline status

Changes 4
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

nixos/modules/monitoring/server/grafana-config/resources-overview.json 1 addition, 1 deletion

.../monitoring/server/grafana-config/resources-overview.json
nixos/modules/monitoring/server/grafana-config/services-overview.json 1 addition, 1 deletion

...s/monitoring/server/grafana-config/services-overview.json
nixos/modules/monitoring/server/prometheus.nix 3 additions, 1 deletion

nixos/modules/monitoring/server/prometheus.nix
nixpkgs-ps.json 2 additions, 2 deletions

nixpkgs-ps.json

with 7 additions and 5 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment