From 36230a7a2d35bfc8b6712a213c8ca2148e1ba5b3 Mon Sep 17 00:00:00 2001 From: Carsten Date: Tue, 7 Mar 2023 15:08:01 +0100 Subject: [PATCH 1/4] Update 02-installation.md Remove not available modes --- doc/02-installation.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/02-installation.md b/doc/02-installation.md index 153b6f3..d7a8c20 100644 --- a/doc/02-installation.md +++ b/doc/02-installation.md @@ -38,7 +38,7 @@ git clone "${REPO_URL}" "${TARGET_DIR}" Replace the version number with the lates available version from [Latest Release](https://github.com/Mikesch-mp/icingaweb2-module-grafana/releases/latest) ``` -MODULE_VERSION="2.0.0" +MODULE_VERSION="2.0.1" ICINGAWEB_MODULEPATH="/usr/share/icingaweb2/modules" REPO_URL="https://github.com/Mikesch-mp/icingaweb2-module-grafana" TARGET_DIR="${ICINGAWEB_MODULEPATH}/grafana" @@ -61,9 +61,9 @@ icingacli module enable grafana ## Grafana Preparations -Depending on which mode (proxy/indirect proxy/direct/iframe) you want to use you have to set some configuration in Grafana +Depending on which mode (indirect proxy/iframe) you want to use you have to set some configuration in Grafana -### For 'proxy' or 'indirect proxy' mode +### For 'indirect proxy' mode If you don't want anonymous access you have to create a user (with password) and enable basic auth in grafana.ini @@ -90,7 +90,7 @@ If you want to allow anonymous access (read only) enable "Anonymous Auth" in gra For API-Token access you need to create an API-Token with Grafana. See the [Grafana Docs](http://docs.grafana.org/tutorials/api_org_token_howto/#how-to-create-a-new-organization-and-an-api-token) on how to create one -### For 'direct' & 'iframe' mode +### For 'iframe' mode You have to enable "Anonymous Auth" in grafana.ini and set default organization or users need to be logged in into Grafana first to see graphs in Icinga Web 2. From 2fda74d50c3e1348273a14e2e9ba5bec0fbac166 Mon Sep 17 00:00:00 2001 From: Carsten Date: Tue, 7 Mar 2023 15:09:02 +0100 Subject: [PATCH 2/4] Update 02-installation.md Update requirements --- doc/02-installation.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/02-installation.md b/doc/02-installation.md index d7a8c20..dd52948 100644 --- a/doc/02-installation.md +++ b/doc/02-installation.md @@ -6,8 +6,8 @@ to the latest version, please [read on here](05-update.md). ## Requirements -* [Icinga Web 2](https://www.icinga.com/products/icinga-web-2/) (>= - 2.11) +* [Icinga Web 2](https://github.com/Icinga/icingaweb2) (>= 2.11) +* [Icinga DB Web](https://github.com/Icinga/icingadb-web) (>= 1.02) * [Grafana](https://grafana.com/) (>= 7.0) * [InfluxDB](https://docs.influxdata.com/influxdb/) (>= 1.0) [Graphite](https://graphiteapp.org) as backend for Grafana * [PHP 8.1](https://www.php.net) **with curl and gd enabled** From 4eda2d48e0fa1fe30c62ff6e738b62b2642b6410 Mon Sep 17 00:00:00 2001 From: Carsten Date: Tue, 7 Mar 2023 15:09:40 +0100 Subject: [PATCH 3/4] Update 02-installation.md Remove the missleading base-metrics dashboard --- doc/02-installation.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/doc/02-installation.md b/doc/02-installation.md index dd52948..d411d51 100644 --- a/doc/02-installation.md +++ b/doc/02-installation.md @@ -124,7 +124,3 @@ Depending which metric backend (influxdb/graphite) you use, import the 2 provide #### icinga2-default dashboard ![Grafana import icinga2-default dashboard](images/grafana-import-icinga2-default-dashboard.png "Grafana import icinga2-default dashboard") - -#### base-metrics dashboard -![Grafana import base-metric dashboard](images/grafana-import-base-metrics-dashboard.png "Grafana import base-metric dashboard") - From ae1cd1d0bbe320624bbf7acdd23ddb7ebda57b46 Mon Sep 17 00:00:00 2001 From: Carsten Date: Tue, 7 Mar 2023 15:10:06 +0100 Subject: [PATCH 4/4] Update 02-installation.md --- doc/02-installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/02-installation.md b/doc/02-installation.md index d411d51..02b5ce2 100644 --- a/doc/02-installation.md +++ b/doc/02-installation.md @@ -120,7 +120,7 @@ Create a datasource depending on the metric backend you want to use. ### Import dashboards -Depending which metric backend (influxdb/graphite) you use, import the 2 provided dashboards. +Depending which metric backend (influxdb/graphite) you use, import the provided dashboards. #### icinga2-default dashboard ![Grafana import icinga2-default dashboard](images/grafana-import-icinga2-default-dashboard.png "Grafana import icinga2-default dashboard")