import grafana-10.2.6-13.el10

SOURCES/0003-update-default-configuration.patch

@@ -66,7 +66,7 @@ index 916de769f9..2f270d4940 100644
  ;app_tls_skip_verify_insecure = false
  # Enter a comma-separated list of plugin identifiers to identify plugins to load even if they are unsigned. Plugins with modified signatures are never loaded.
 -;allow_loading_unsigned_plugins =
-+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
++allow_loading_unsigned_plugins = performancecopilot-pcp-app,pcp-valkey-datasource,pcp-vector-datasource,pcp-bpftrace-datasource,pcp-flamegraph-panel,pcp-breadcrumbs-panel,pcp-troubleshooting-panel,performancecopilot-valkey-datasource,performancecopilot-vector-datasource,performancecopilot-bpftrace-datasource,performancecopilot-flamegraph-panel,performancecopilot-breadcrumbs-panel,performancecopilot-troubleshooting-panel
  # Enable or disable installing / uninstalling / updating plugins directly from within Grafana.
  ;plugin_admin_enabled = false
  ;plugin_admin_external_manage_enabled = false

SOURCES/grafana.fc

@@ -22,4 +22,5 @@
 
 #define context for pcp plugin
 #/usr/share/performancecopilot-pcp-app/datasources/redis/pcp_redis_datasource_(.*)           -- gen_context(system_u:object_r:grafana_pcp_exec_t,s0)
-/usr/libexec/grafana-pcp/datasources/redis/pcp_redis_datasource_(.*)           -- gen_context(system_u:object_r:grafana_pcp_exec_t,s0)
+/usr/libexec/grafana-pcp/datasources/redis/pcp_redis_datasource_(.*)           -- gen_context(system_u:object_r:grafana_pcp_exec_t,s0)
+/usr/libexec/grafana-pcp/datasources/valkey/pcp_valkey_datasource_(.*)         -- gen_context(system_u:object_r:grafana_pcp_exec_t,s0)

SOURCES/grafana.te

@@ -82,6 +82,9 @@ can_exec(grafana_t, grafana_pcp_exec_t)
 corenet_tcp_connect_all_ephemeral_ports(grafana_t)
 grafana_exec(grafana_t)
 
+# Allow grafana to connect to mssql's default tcp port of 1433 
+corenet_tcp_connect_mssql_port(grafana_t)
+
 ########################################
 #
 # grafana local policy

SPECS/grafana.spec

@@ -25,7 +25,7 @@ end}
 
 Name:             grafana
 Version:          10.2.6
-Release:          9%{?dist}
+Release:          13%{?dist}
 Summary:          Metrics dashboard and graph editor
 License:          AGPL-3.0-only
 URL:              https://grafana.org
@@ -1024,6 +1024,21 @@ fi
 %{_datadir}/selinux/*/grafana.pp
 
 %changelog
+* Tue Nov 26 2024 Sam Feifer <sfeifer@redhat.com> - 10.2.6-13
+- Resolves RHEL-68657: Update configurations to allow loading the valkey datasource
+- Revert changes that break older custom dashboards
+
+* Mon Nov 25 2024 Sam Feifer <sfeifer@redhat.com> - 10.2.6-12
+- Resolves RHEL-68657: Update configurations to allow loading the valkey datasource
+- Clean up the grafana.ini file
+
+* Fri Nov 22 2024 Sam Feifer <sfeifer@redhat.com> - 10.2.6-11
+- Resolves RHEL-68657: Update configurations to allow loading the valkey datasource
+
+* Mon Nov 11 2024 Sam Feifer <sfeifer@redhat.com> - 10.2.6-10
+- Resolves RHEL-67042: update selinux policy for valkey datasource
+- Resolves RHEL-61900: allow mssql datasource in selinux policy
+
 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 10.2.6-9
 - Bump release for October 2024 mass rebuild:
   Resolves: RHEL-64018