Merge branch 'andreasgerstmayr-permit-grafana-pcp-plugin-ids'

Author: natoscott

roles/grafana/tasks/main.yml

@@ -17,12 +17,29 @@
     name: "{{ __grafana_packages + __grafana_packages_extra }}"
     state: present
 
-- name: Template Grafana configuration
+- name: Get package facts now that Grafana is installed
+  package_facts:
+    manager: "auto"
+
+- name: Get Grafana version number from installed packages
+  set_fact:
+    grafana_version: "{{ ansible_facts.packages.grafana[0].version }}"
+
+- name: Template Grafana v7 configuration
   template:
-    src: grafana.ini.j2
+    src: grafana_7.ini.j2
     dest: "{{ __grafana_conf }}"
     mode: 0640
   notify: restart grafana
+  when: grafana_version is version('9.0.0', '<')
+
+- name: Template Grafana v9 configuration
+  template:
+    src: grafana_9.ini.j2
+    dest: "{{ __grafana_conf }}"
+    mode: 0640
+  notify: restart grafana
+  when: grafana_version is version('9.0.0', '>=')
 
 - name: Ensure Grafana configuration directory exists
   file:
@@ -46,14 +63,6 @@
     state: started
     enabled: yes
 
-- name: Get package facts now that Grafana is installed
-  package_facts:
-    manager: "auto"
-
-- name: Get Grafana version number from installed packages
-  set_fact:
-    grafana_version: "{{ ansible_facts.packages.grafana[0].version }}"
-
 # yamllint disable rule:line-length
 - name: Ensure graphing service settings are configured by HTTP POST
   uri:

roles/grafana/templates/grafana.ini.j2 renamed to roles/grafana/templates/grafana_7.ini.j2

@@ -770,7 +770,7 @@ disable_sanitize_html = false
 enable_alpha = false
 app_tls_skip_verify_insecure = false
 # Enter a comma-separated list of plugin identifiers to identify plugins that are allowed to be loaded even if they lack a valid signature.
-allow_loading_unsigned_plugins = pcp-redis-datasource
+allow_loading_unsigned_plugins = performancecopilot-pcp-app,pcp-redis-datasource,pcp-vector-datasource,pcp-bpftrace-datasource,pcp-flamegraph-panel,pcp-breadcrumbs-panel,pcp-troubleshooting-panel,performancecopilot-redis-datasource,performancecopilot-vector-datasource,performancecopilot-bpftrace-datasource,performancecopilot-flamegraph-panel,performancecopilot-breadcrumbs-panel,performancecopilot-troubleshooting-panel
 marketplace_url = https://grafana.com/grafana/plugins/
 
 #################################### Grafana Image Renderer Plugin ##########################