WIP

.gitignore

@@ -1,7 +1,7 @@
 /out/
 build
 .gradle
-/.idea
+.idea
 bin
 .project
 .classpath
@@ -12,4 +12,4 @@ hs_err_pid*.log
 .vscode
 /README.html
 /spring-shell.log
-tools/redis-smart-cache-cli/spring-shell.log
+tools/redis-smart-cache-cli/spring-shell.log

docker-compose.yml

@@ -15,13 +15,14 @@ services:
       - MYSQL_DATABASE=smartcache
 
   grafana:
-    image: grafana/grafana:9.5.2
+    image: smartcache/grafana
+    build:
+      context: ./docker/grafana
+      dockerfile: ./Dockerfile
     hostname: grafana
     container_name: grafana
     ports:
       - 3000:3000
-    environment:
-      - GF_INSTALL_PLUGINS=redis-app
 
   redis:
     image: redis/redis-stack-server
@@ -31,7 +32,7 @@ services:
       - 6379:6379
 
   demo:
-    image: fieldengineering/demo-redis-smart-cache:early-access
+    image: demo
     hostname: smartcache
     container_name: smartcache
     restart: on-failure
@@ -42,4 +43,4 @@ services:
       - 8080:8080
     environment:
       - SPRING_REDIS_HOST=redis
-      - SPRING_DATASOURCE_URL=jdbc:mysql://mysql/smartcache
+      - SPRING_DATASOURCE_URL=jdbc:mysql://mysql/smartcache

docker/grafana/Dockerfile

@@ -0,0 +1,9 @@
+FROM grafana/grafana:9.5.2
+ENV GF_INSTALL_PLUGINS=redis-datasource
+
+COPY defaults.ini /etc/grafana/grafana.ini
+COPY grafana.db /var/lib/grafana/grafana.db
+
+USER root
+RUN chown grafana /etc/grafana/grafana.ini
+RUN chown grafana /var/lib/grafana/grafana.db