From 39373284fed6332913ab9bb400e94967c2d654e4 Mon Sep 17 00:00:00 2001
From: Evangelos Foutras <evangelos@foutras.com>
Date: Sat, 4 Nov 2023 18:32:27 +0200
Subject: [PATCH] Fix broken grafana.ini rebase from previous commit

The last hunk which I applied manually incorrectly retained its pluses.

Fixes: 825a0c92a227 ("grafana: rebase grafana.ini to grafana 10.2.0-1")
---
 roles/grafana/templates/grafana.ini.j2 | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/roles/grafana/templates/grafana.ini.j2 b/roles/grafana/templates/grafana.ini.j2
index dbb58403d..a8f39f8bd 100644
--- a/roles/grafana/templates/grafana.ini.j2
+++ b/roles/grafana/templates/grafana.ini.j2
@@ -1577,13 +1577,13 @@ mode = syslog
 ################################## Feature Management ##############################################
 [feature_management]
 # Options to configure the experimental Feature Toggle Admin Page feature, which is behind the `featureToggleAdminPage` feature toggle. Use at your own risk.
-+# Allow editing of feature toggles in the feature management page
-+;allow_editing = false
-+# Allow customization of URL for the controller that manages feature toggles
-+;update_webhook =
-+# Allow configuring an auth token for feature management update requests
-+;update_webhook_token =
-+# Hide specific feature toggles from the feature management page
-+;hidden_toggles =
-+# Disable updating specific feature toggles in the feature management page
-+;read_only_toggles =
+# Allow editing of feature toggles in the feature management page
+;allow_editing = false
+# Allow customization of URL for the controller that manages feature toggles
+;update_webhook =
+# Allow configuring an auth token for feature management update requests
+;update_webhook_token =
+# Hide specific feature toggles from the feature management page
+;hidden_toggles =
+# Disable updating specific feature toggles in the feature management page
+;read_only_toggles =
-- 
GitLab