Skip to content
This repository was archived by the owner on Feb 2, 2021. It is now read-only.

Commit 6f1e767

Browse files
author
Jarret Lavallee
committed
Update datasource for the metrics to be puppet_metrics_dashboard
Prior to this commit, the old repo was used for the dashboard downloads. This commit updates it to the new and current module.
1 parent fae5f31 commit 6f1e767

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ To run this code, you will need [Docker](https://www.docker.com/products/overvie
1414
With Docker installed, you can run the script `view-in-grafana.sh`, passing it the directory containing the data files to load into Graphite. e.g.
1515

1616
```
17-
./view-in-grafana.sh ~/Downloads/pe_metrics/puppetserver
17+
./view-in-grafana.sh ~/Downloads/puppet_metrics/puppetserver
1818
```
1919

2020
You can then view the metrics by visting `http://localhost:3000` in your browser.
@@ -29,7 +29,7 @@ The `view-in-grafana.sh` script has several options that can change the behavior
2929
By default, the script uses a retention of 30 days. You can specify a different retention peroid if desired.
3030

3131
```
32-
./view-in-grafana.sh ~/Downloads/pe_metrics/puppetserver 10
32+
./view-in-grafana.sh ~/Downloads/puppet_metrics/puppetserver 10
3333
```
3434

3535
_Note:_ `.json` files outside the retention peroid will be deleted as the asumption is that they exist in the tar balls.
@@ -38,14 +38,14 @@ _Note:_ `.json` files outside the retention peroid will be deleted as the asumpt
3838
By default, InfluxDB is used to store the data. New capabilities have been built to use InfluxDB as the back end database in `json2graphite.rb` and can be used as the back end database container. Graphite can be used as well with the following option.
3939

4040
```
41-
./view-in-grafana.sh -d graphite ~/Downloads/pe_metrics/puppetserver
41+
./view-in-grafana.sh -d graphite ~/Downloads/puppet_metrics/puppetserver
4242
```
4343

4444
#### Build the local containers instead of from Dockerhub
4545
To test dashboard updates, you can specify the `-b` option to build the local `grafana-puppetserver` container.
4646

4747
```
48-
./view-in-grafana.sh -b ~/Downloads/pe_metrics/puppetserver
48+
./view-in-grafana.sh -b ~/Downloads/puppet_metrics/puppetserver
4949
5050
```
5151

influxdb-grafana/grafana/datasources/datasource.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# whats available in the datbase
33
datasources:
44
# <string, required> name of the datasource. Required
5-
- name: influxdb_pe_metrics
5+
- name: influxdb_puppet_metrics
66
# <string, required> datasource type. Required
77
type: influxdb
88
# <string, required> access mode. direct or proxy. Required

view-in-grafana.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ finish() {
6666

6767
download_dashboards() {
6868
mkdir -p ./grafana/imports
69-
wget -q -N -P ./grafana/imports https://raw.githubusercontent.com/puppetlabs/puppetlabs-pe_metrics_dashboard/master/files/PuppetDB_Performance.json
70-
wget -q -N -P ./grafana/imports https://raw.githubusercontent.com/puppetlabs/puppetlabs-pe_metrics_dashboard/master/files/PuppetDB_Workload.json
71-
wget -q -N -P ./grafana/imports https://raw.githubusercontent.com/puppetlabs/puppetlabs-pe_metrics_dashboard/master/files/Puppetserver_Performance.json
69+
wget -q -N -P ./grafana/imports https://raw.githubusercontent.com/puppetlabs/puppet_metrics_dashboard/master/files/PuppetDB_Performance.json
70+
wget -q -N -P ./grafana/imports https://raw.githubusercontent.com/puppetlabs/puppet_metrics_dashboard/master/files/PuppetDB_Workload.json
71+
wget -q -N -P ./grafana/imports https://raw.githubusercontent.com/puppetlabs/puppet_metrics_dashboard/master/files/Puppetserver_Performance.json
7272
}
7373

7474
get_latest_containers() {

0 commit comments

Comments
 (0)