Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Prometheus and Grafana monitoring stack #153

Merged
merged 5 commits into from
Mar 9, 2018
Merged

Update Prometheus and Grafana monitoring stack #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9307e97
addons: Update Prometheus from v2.1.0 to v2.2.0
dghubble Mar 3, 2018
9dcc255
addons: Update from Grafana v4.6.3 to v5.0.0
dghubble Mar 3, 2018
0e688ef
Update CHANGES.md changelog with monitoring updates
dghubble Mar 3, 2018
d54709f
Update Grafana from v5.0.0 to 5.0.1
dghubble Mar 9, 2018
42708f9
Update Prometheus from v2.2.0-rc.1 to v2.2.0
dghubble Mar 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ Notable changes between versions.

#### Addons

* Update Prometheus from 2.1.0 to 2.2.0 ([#153](https://github.com/poseidon/typhoon/pull/153))
* Update Grafana from v4.6.3 to v5.0.1 ([#153](https://github.com/poseidon/typhoon/pull/153))
* Update heapster from v1.5.0 to v1.5.1 ([#131](https://github.com/poseidon/typhoon/pull/131))
* Use separate service account
* Update nginx-ingress from 0.10.2 to 0.11.0
Expand Down
15 changes: 15 additions & 0 deletions addons/grafana/dashboard-providers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: grafana-dashboard-providers
namespace: monitoring
data:
dashboard-providers.yaml: |+
apiVersion: 1
providers:
- name: 'default'
ordId: 1
folder: ''
type: file
options:
path: /var/lib/grafana/dashboards
Loading