Merge branch 'master' of gitlab.com:allianceauth/allianceauth into v4.x

docker/.env.example

@@ -1,7 +1,7 @@
 PROTOCOL=https://
 AUTH_SUBDOMAIN=%AUTH_SUBDOMAIN%
 DOMAIN=%DOMAIN%
-AA_DOCKER_TAG=registry.gitlab.com/allianceauth/allianceauth/auth:v3.4.0
+AA_DOCKER_TAG=registry.gitlab.com/allianceauth/allianceauth/auth:v3.6.1
 
 # Nginx Proxy Manager
 PROXY_HTTP_PORT=80
@@ -21,6 +21,7 @@ AA_DB_NAME=alliance_auth
 AA_DB_USER=aauth
 AA_DB_PASSWORD=%AA_DB_PASSWORD%
 AA_DB_ROOT_PASSWORD=%AA_DB_ROOT_PASSWORD%
+AA_DB_CHARSET=utf8mb4
 AA_EMAIL_HOST=''
 AA_EMAIL_PORT=587
 AA_EMAIL_HOST_USER=''

docker/Dockerfile

@@ -18,7 +18,7 @@ RUN mkdir -p ${STATIC_BASE} \
 
 # Install build dependencies
 RUN apt-get update && apt-get upgrade -y && apt-get install -y \
-    libmariadb-dev gcc git
+    libmariadb-dev gcc git pkg-config
 
 # Install python dependencies
 RUN pip install --upgrade pip

docker/conf/local.py

@@ -17,6 +17,9 @@ DATABASES["default"] = {
     "PASSWORD": os.environ.get("AA_DB_PASSWORD"),
     "HOST": os.environ.get("AA_DB_HOST"),
     "PORT": os.environ.get("AA_DB_PORT", "3306"),
+    "OPTIONS": {
+        "charset": os.environ.get("AA_DB_CHARSET", "utf8mb4")
+    }
 }
 
 # Register an application at https://developers.eveonline.com for Authentication

docker/docker-compose.yml

@@ -115,7 +115,13 @@ services:
     depends_on:
       - auth_mysql
     volumes:
+      - ./grafana-datasource.yml:/etc/grafana/provisioning/datasources/datasource.yaml
+      - ./grafana-dashboards.yml:/etc/grafana/provisioning/dashboards/datasource.yaml
+      - ./grafana/dashboards:/var/lib/grafana/dashboards:ro
       - grafana-data:/var/lib/grafana
+    environment:
+      GF_INSTALL_PLUGINS: grafana-piechart-panel,grafana-clock-panel,grafana-simple-json-datasource
+      GF_AUTH_DATABASE_PASSWORD: ${GRAFANA_DB_PASSWORD}
 
   proxy:
     image: 'jc21/nginx-proxy-manager:latest'

docker/grafana-dashboards.yml

@@ -0,0 +1,25 @@
+apiVersion: 1
+
+providers:
+  # <string> an unique provider name
+- name: 'auth dashboards'
+  # <int> org id. will default to orgId 1 if not specified
+  orgId: 1
+  # <string, required> name of the dashboard folder. Required
+  folder: ''
+  # <string> folder UID. will be automatically generated if not specified
+  folderUid: ''
+  # <string, required> provider type. Required
+  type: file
+  # <bool> disable dashboard deletion
+  disableDeletion: false
+  # <bool> enable dashboard editing
+  editable: true
+  # <int> how often Grafana will scan for changed dashboards
+  updateIntervalSeconds: 10
+  # <bool> allow updating provisioned dashboards from the UI
+  allowUiUpdates: false
+  options:
+    # <string, required> path to dashboard files on disk. Required
+    path: /var/lib/grafana/dashboards
+    foldersFromFilesStructure: true

docker/grafana-datasource.yml

@@ -0,0 +1,12 @@
+apiVersion: 1
+
+datasources:
+
+- name: MySQL
+  type: mysql
+  url: auth_mysql
+  database: alliance_auth
+  user: grafana
+  editable: true
+  secureJsonData:
+    password: ${GF_AUTH_DATABASE_PASSWORD}