diff --git a/docs/assets/images/grafana_dashboard.png b/docs/assets/images/grafana_dashboard.png deleted file mode 100644 index 6a57a4cd..00000000 Binary files a/docs/assets/images/grafana_dashboard.png and /dev/null differ diff --git a/docs/assets/images/grafana_dashboard_1.png b/docs/assets/images/grafana_dashboard_1.png new file mode 100644 index 00000000..68c281b6 Binary files /dev/null and b/docs/assets/images/grafana_dashboard_1.png differ diff --git a/docs/assets/images/grafana_dashboard_2.png b/docs/assets/images/grafana_dashboard_2.png new file mode 100644 index 00000000..48375bca Binary files /dev/null and b/docs/assets/images/grafana_dashboard_2.png differ diff --git a/docs/assets/images/grafana_dashboard_3.png b/docs/assets/images/grafana_dashboard_3.png new file mode 100644 index 00000000..fc14753b Binary files /dev/null and b/docs/assets/images/grafana_dashboard_3.png differ diff --git a/docs/assets/images/grafana_dashboard_4.png b/docs/assets/images/grafana_dashboard_4.png new file mode 100644 index 00000000..969dd598 Binary files /dev/null and b/docs/assets/images/grafana_dashboard_4.png differ diff --git a/docs/howtos/monitoring.md b/docs/howtos/monitoring.md index 03825d81..011f8897 100644 --- a/docs/howtos/monitoring.md +++ b/docs/howtos/monitoring.md @@ -10,7 +10,7 @@ nav_order: 1 Thundernetes is able to export game server related metrics to a [Prometheus](https://prometheus.io/docs/introduction/overview/) server, and these can also be imported to a [Grafana](https://grafana.com/docs/grafana/latest/introduction/) server for easy and intuitive visualizations. -[![Grafana Dasboard Example](../assets/images/grafana_dashboard.png)](../assets/images/grafana_dashboard.png) +![Grafana Dasboard Example](../assets/images/grafana_dashboard_1.png) Prometheus uses a pull model to retrieve data, and needs apps to implement an endpoint that responds to its HTTP requests. For this, Thundernetes exposes the following endpoints: @@ -92,3 +92,11 @@ There is a custom Grafana dashboard example that visualizes some of this data in | gameservers_crashed_total | Counter | controller-manager | | gameservers_deleted_total | Counter | controller-manager | | allocations_total | Counter | controller-manager | + +## More pictures + +![Grafana Dasboard Example 2](../assets/images/grafana_dashboard_2.png) + +![Grafana Dasboard Example 3](../assets/images/grafana_dashboard_3.png) + +![Grafana Dasboard Example 4](../assets/images/grafana_dashboard_4.png) diff --git a/samples/grafana/readme.md b/samples/grafana/README.md similarity index 53% rename from samples/grafana/readme.md rename to samples/grafana/README.md index bcdc69bc..2b47799b 100644 --- a/samples/grafana/readme.md +++ b/samples/grafana/README.md @@ -1,5 +1,12 @@ # Sample Grafana Dashboard -[![Grafana Dasboard Example](../../docs/assets/images/grafana_dashboard.png)](../../docs/assets/images/grafana_dashboard.pnggrafana_dashboard.png) - The `dashboard.json` file in this folder can be imported to grafana to provide a simple example of retrieving metrics from the Thundernetes Controller. It makes the assumption that the Prometheus data source is named `Prometheus`, so you may need to edit the json file before importing if your Grafana installation uses a different name. + + +![Grafana Dasboard Example](../../docs/assets/images/grafana_dashboard_1.png) + +![Grafana Dasboard Example 2](../../docs/assets/images/grafana_dashboard_2.png) + +![Grafana Dasboard Example 3](../../docs/assets/images/grafana_dashboard_3.png) + +![Grafana Dasboard Example 4](../../docs/assets/images/grafana_dashboard_4.png) diff --git a/samples/grafana/dashboard.json b/samples/grafana/dashboard.json index 9451013b..255b46c4 100644 --- a/samples/grafana/dashboard.json +++ b/samples/grafana/dashboard.json @@ -271,6 +271,10 @@ "pluginVersion": "8.4.5", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "P1809F7CD0C75ACF3" + }, "exemplar": true, "expr": "sum(thundernetes_allocations_total)", "interval": "", @@ -664,7 +668,7 @@ "refId": "A" } ], - "title": "Active servers time series", + "title": "Standby servers time series", "type": "timeseries" }, { @@ -1519,13 +1523,13 @@ "list": [] }, "time": { - "from": "now-3h", + "from": "now-1h", "to": "now" }, "timepicker": {}, "timezone": "", "title": "Thundernetes GameServer Demo", "uid": "T9KjuZOnz", - "version": 2, + "version": 3, "weekStart": "" -} \ No newline at end of file +}