Merge pull request #946 from traPtitech/chore/update-dev-environment

chore(dev-env): update dependencies / configs
traPtitech · Aug 2, 2024 · e29514c · e29514c
2 parents a393225 + c1b5e24
commit e29514c
Show file tree

Hide file tree

Showing 8 changed files with 77 additions and 67 deletions.
diff --git a/.local-dev/config/loki.yaml b/.local-dev/config/loki.yaml
@@ -3,6 +3,9 @@ auth_enabled: false
 server:
   http_listen_port: 3100
 
+common:
+  path_prefix: /var/lib/loki
+
 ingester:
   lifecycler:
     address: 127.0.0.1
@@ -19,22 +22,19 @@ ingester:
 
 schema_config:
   configs:
-    - from: 2020-11-18
-      store: boltdb
+    - from: "2024-04-01"
       object_store: filesystem
-      schema: v12
+      store: tsdb
+      schema: v13
       index:
-        prefix: loki_index_
-        period: 168h
+        prefix: index_
+        period: 24h
 
 storage_config:
-  boltdb:
-    directory: /var/lib/loki/index
   filesystem:
     directory: /var/lib/loki/chunks
 
 limits_config:
-  enforce_metric_name: false
   reject_old_samples: true
   reject_old_samples_max_age: 168h
 

diff --git a/.local-dev/config/ns-auth.ini b/.local-dev/config/ns-auth.ini
diff --git a/.local-dev/config/ns-auth.yaml b/.local-dev/config/ns-auth.yaml
@@ -0,0 +1,35 @@
+secret: A0iQP-1A_RLBqaTOfLs6fhUzNWO29bIB
+insecure-cookie: true
+log-level: info
+
+auth-host: auth.local.trapti.tech
+cookie-domains:
+  - local.trapti.tech
+cookieName: "_forward_auth"
+info-fields:
+  - name
+
+provider: generic-oauth
+
+providers:
+  generic-oauth:
+    auth-url: https://q.toki317.dev/api/v3/oauth2/authorize
+    token-url: https://q.toki317.dev/api/v3/oauth2/token
+    user-url: https://q.toki317.dev/api/v3/users/me
+    client-id: RFOhjMbt3VsR75uaMwhWH21pUkhfE8DqVeXT
+    client-secret: N4rzl3JlQJprKNNi2EYl2biifjKprB9HS9PO
+    scopes:
+      - read
+
+rule:
+  soft:
+    action: soft-auth
+    route-rule: Header(`X-Forward-Auth-Type`, `soft`)
+  hard:
+    action: auth
+    route-rule: rule.hard.rule = Header(`X-Forward-Auth-Type`, `hard`)
+
+headers:
+  default:
+    name: X-Showcase-User
+    source: name
diff --git a/.local-manifest/auth/deployment.yaml b/.local-manifest/auth/deployment.yaml
@@ -25,13 +25,13 @@ spec:
 
       containers:
         - name: ns-auth
-          image: ghcr.io/traptitech/traefik-forward-auth:3.0.0
+          image: ghcr.io/traptitech/traefik-forward-auth:3.2.1
           args:
-            - --config=/config.ini
+            - --config=/config.yaml
           ports:
             - containerPort: 4181
               name: http
           volumeMounts:
             - name: project
-              subPath: .local-dev/config/ns-auth.ini
-              mountPath: /config.ini
+              subPath: .local-dev/config/ns-auth.yaml
+              mountPath: /config.yaml
diff --git a/.local-manifest/monitor/grafana/stateful-set.yaml b/.local-manifest/monitor/grafana/stateful-set.yaml
@@ -25,7 +25,7 @@ spec:
 
       containers:
         - name: grafana
-          image: grafana/grafana:10.0.1
+          image: grafana/grafana:11.1.3
           imagePullPolicy: IfNotPresent
           ports:
             - name: http

diff --git a/.local-manifest/monitor/loki/stateful-set.yaml b/.local-manifest/monitor/loki/stateful-set.yaml
@@ -25,7 +25,7 @@ spec:
 
       containers:
         - name: loki
-          image: grafana/loki:2.8.0
+          image: grafana/loki:3.1.0
           imagePullPolicy: IfNotPresent
           args:
             - -config.file=/etc/loki/loki.yaml

diff --git a/.local-manifest/monitor/victoria-metrics/stateful-set.yaml b/.local-manifest/monitor/victoria-metrics/stateful-set.yaml
@@ -28,7 +28,7 @@ spec:
 
       containers:
         - name: victoria-metrics
-          image: victoriametrics/victoria-metrics:v1.91.3
+          image: victoriametrics/victoria-metrics:v1.102.1
           imagePullPolicy: IfNotPresent
           args:
             - --promscrape.config=/etc/config/prometheus.yml

diff --git a/compose.yaml b/compose.yaml
@@ -79,31 +79,31 @@ services:
     networks:
       - default
 
-# Uncomment if testing gitea integration
-#  ns-gitea-integration:
-#    build:
-#      context: .
-#      target: ns-gitea-integration
-#    image: ghcr.io/traptitech/ns-gitea-integration:main
-#    command: --config=/config.yaml
-#    restart: always
-#    volumes:
-#      - ./.local-dev/config/ns.yaml:/config.yaml
-#    depends_on:
-#      mysql:
-#        condition: service_healthy
-#      ns-migrate:
-#        condition: service_completed_successfully
-#    networks:
-#      - default
+  # Uncomment if testing gitea integration
+  #  ns-gitea-integration:
+  #    build:
+  #      context: .
+  #      target: ns-gitea-integration
+  #    image: ghcr.io/traptitech/ns-gitea-integration:main
+  #    command: --config=/config.yaml
+  #    restart: always
+  #    volumes:
+  #      - ./.local-dev/config/ns.yaml:/config.yaml
+  #    depends_on:
+  #      mysql:
+  #        condition: service_healthy
+  #      ns-migrate:
+  #        condition: service_completed_successfully
+  #    networks:
+  #      - default
 
   ns-auth:
-    image: ghcr.io/traptitech/traefik-forward-auth:3.0.0
+    image: ghcr.io/traptitech/traefik-forward-auth:3.2.1
     restart: always
     command:
-      - --config=/config.ini
+      - --config=/config.yaml
     volumes:
-      - ./.local-dev/config/ns-auth.ini:/config.ini
+      - ./.local-dev/config/ns-auth.yaml:/config.yaml
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.ns_auth.rule=Host(`auth.local.trapti.tech`)"
@@ -323,7 +323,7 @@ services:
       - default
 
   grafana:
-    image: grafana/grafana:10.0.1
+    image: grafana/grafana:11.1.3
     restart: always
     labels:
       - "traefik.enable=true"
@@ -336,7 +336,7 @@ services:
       - default
 
   loki:
-    image: grafana/loki:2.8.0
+    image: grafana/loki:3.1.0
     command: "-config.file /etc/loki/loki.yaml"
     restart: always
     labels:
@@ -351,7 +351,7 @@ services:
       - default
 
   promtail:
-    image: grafana/promtail:2.8.0
+    image: grafana/promtail:3.1.0
     command: "-config.file /etc/promtail/promtail.yaml"
     restart: always
     volumes:
@@ -362,7 +362,7 @@ services:
       - default
 
   victoria-metrics:
-    image: victoriametrics/victoria-metrics:v1.91.3
+    image: victoriametrics/victoria-metrics:v1.102.1
     command:
       - --promscrape.config=/etc/config/prometheus.yml
       - --promscrape.maxScrapeSize=256MB
@@ -376,7 +376,7 @@ services:
       - ./.local-dev/victoria-metrics:/data
 
   cadvisor:
-    image: gcr.io/cadvisor/cadvisor:v0.47.2
+    image: gcr.io/cadvisor/cadvisor:v0.50.0
     privileged: true
     devices:
       - /dev/kmsg
@@ -390,7 +390,7 @@ services:
       - /dev/disk/:/dev/disk:ro
 
   traefik:
-    image: traefik:3.0.0
+    image: traefik:3.1
     restart: always
     command:
       - --api.insecure=true
@@ -431,7 +431,7 @@ services:
       - apps
 
 networks:
-  default: { }
+  default: {}
   apps:
     name: neoshowcase_apps
     external: true