Fix #35060: update Grafana + align monitoring config

Author: LEDfan

src/main/kotlin/eu/openanalytics/shinyproxyoperator/impl/docker/monitoring/GrafanaConfig.kt

@@ -37,7 +37,7 @@ import java.nio.file.Path
 class GrafanaConfig(private val dockerClient: DockerClient, private val dockerActions: DockerActions, private val mainDataDir: Path, private val caddyConfig: CaddyConfig, config: Config) {
 
     private val logger = KotlinLogging.logger {}
-    private val grafanaImage: String = config.readConfigValue("docker.io/grafana/grafana-oss:11.5.1", "SPO_GRAFANA_IMAGE") { it }
+    private val grafanaImage: String = config.readConfigValue("docker.io/grafana/grafana-oss:11.6.1", "SPO_GRAFANA_IMAGE") { it }
     private val grafanaRole: String = config.readConfigValue("Viewer", "SPO_GRAFANA_ROLE") { it }
     private val fileManager = FileManager()
 

src/main/resources/configs/docker/monitoring/grafana/datasources/datasources.yaml

@@ -13,10 +13,14 @@ datasources:
     jsonData:
       timeInterval: "30s"
       seriesEndpoint: true
+      timeout: 300s
+      queryTimeout: 300s
   - name: Loki
     type: loki
     access: proxy
     orgId: 1
     uid: loki
     url: http://sp-grafana-loki:3100
     version: 1
+    jsonData:
+      timeout: "300"

src/main/resources/configs/docker/monitoring/prometheus.yml

@@ -1,5 +1,6 @@
 scrape_configs:
   - job_name: 'shinyproxy'
+    scrape_interval: 30s
     metrics_path: '/actuator/prometheus'
     docker_sd_configs:
       - host: unix:///var/run/docker.sock