diff options
| author | lassulus <lassulus@lassul.us> | 2019-10-14 16:02:12 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2019-10-14 16:02:12 +0200 |
| commit | 7f7ce8077e4fa6fa023c63c4d1444576179859c3 (patch) | |
| tree | 12e48733a1b1dbbcd3dc9d9aa72dba0393b666e7 /krebs/1systems | |
| parent | 539f4f09fc31552f58b0d32eec2a7b22000d3939 (diff) | |
| parent | 8273bcc77c83307faec8963a48758cd51ad044ac (diff) | |
Merge remote-tracking branch 'gum/19.09' into 19.09
Diffstat (limited to 'krebs/1systems')
| -rw-r--r-- | krebs/1systems/puyak/config.nix | 2 | ||||
| -rw-r--r-- | krebs/1systems/wolf/config.nix | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix index 6321b6cc4..6493c6df4 100644 --- a/krebs/1systems/puyak/config.nix +++ b/krebs/1systems/puyak/config.nix @@ -14,6 +14,8 @@ <stockholm/krebs/2configs/news.nix> <stockholm/krebs/2configs/news-spam.nix> <stockholm/krebs/2configs/shack/prometheus/node.nix> + <stockholm/krebs/2configs/shack/prometheus/server.nix> + <stockholm/krebs/2configs/shack/prometheus/unifi.nix> <stockholm/krebs/2configs/shack/gitlab-runner.nix> ## Collect local statistics via collectd and send to collectd diff --git a/krebs/1systems/wolf/config.nix b/krebs/1systems/wolf/config.nix index 6e53637e6..e47c43fe1 100644 --- a/krebs/1systems/wolf/config.nix +++ b/krebs/1systems/wolf/config.nix @@ -62,9 +62,9 @@ in <stockholm/krebs/2configs/shack/netbox.nix> # prometheus.shack - <stockholm/krebs/2configs/shack/prometheus/server.nix> + #<stockholm/krebs/2configs/shack/prometheus/server.nix> <stockholm/krebs/2configs/shack/prometheus/node.nix> - <stockholm/krebs/2configs/shack/prometheus/unifi.nix> + #<stockholm/krebs/2configs/shack/prometheus/unifi.nix> # grafana.shack <stockholm/krebs/2configs/shack/grafana.nix> |