Compare commits
101 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d511388401 | |||
|
695f43f5bf
|
|||
| 3980f61f44 | |||
| 102c6263a3 | |||
| 3e05a29191 | |||
| e76d33715f | |||
| 2959b0a03d | |||
| 9cc35893c9 | |||
| f2505960d7 | |||
| 65ea4cfe6c | |||
| f3f76d6f34 | |||
| e441293f47 | |||
| 886d5f266d | |||
| 5d86515bbd | |||
| 0350a29e61 | |||
| 23041a7cb1 | |||
| 574daf43be | |||
| adc5e75b07 | |||
| 79d9fded3b | |||
| 72652cde2e | |||
| c3e7968a45 | |||
| 2b7e2ce9a3 | |||
| 307e165af9 | |||
| b8366e0009 | |||
| b174b1d27d | |||
|
d146365fff
|
|||
| 64bfeee043 | |||
| 9ff1530bdf | |||
| 968e96c3a5 | |||
| d4699dbf9b | |||
| e52edaca66 | |||
| 7238bbd720 | |||
| 5620e05e94 | |||
| 75e76f6e37 | |||
| 8e20ff37da | |||
| cda142b3d1 | |||
| f0eb28a627 | |||
| 30f0b45618 | |||
| e480c57b74 | |||
| c09f883ca7 | |||
| fb06a92d75 | |||
| d94b0ec137 | |||
| 5646300ad7 | |||
| cd8d699c4c | |||
| 1529885797 | |||
| aecd8fd868 | |||
| 3562eb6ba2 | |||
| 6ea4a80bfe | |||
| d6096121e5 | |||
| fd934482e0 | |||
| 85deb2014b | |||
| ba51eda94f | |||
| 28def55aa6 | |||
| 3acdcbeed3 | |||
| 37eccee222 | |||
| 67772a7ce2 | |||
| 1861e7d3e6 | |||
| 366745a475 | |||
| 329ff86ff0 | |||
| cb3c75bfdb | |||
| c7bf676b76 | |||
| 4891080aa6 | |||
| 9c8c07809f | |||
| 06506b0ba9 | |||
| d51ab8d65e | |||
| af66872de7 | |||
| b6b71fc37d | |||
| 89a81a4ba0 | |||
| 8d1fc597bd | |||
| a44ebbcb19 | |||
| 0bb0173009 | |||
| a4e52b258e | |||
| cb671b92ce | |||
| 470ac2420f | |||
| 16273bb3c9 | |||
| e91ce2974f | |||
| 0528eb2009 | |||
| 54d2aec413 | |||
|
38fb1d778f
|
|||
| b99af34324 | |||
| 3b9d698660 | |||
| dc14e0b75b | |||
|
5aad5318e8
|
|||
| ce79c19ebd | |||
| 4aac07170a | |||
| b09e90304c | |||
| fe3dd36245 | |||
|
c77eae155f
|
|||
|
f975b70e59
|
|||
|
ba51468d97
|
|||
|
95bc09d93e
|
|||
|
c84da247c3
|
|||
|
3146b30696
|
|||
|
f5f877f6e0
|
|||
| 88ca10e3d4 | |||
| 2580a8915d | |||
| 00970855f9 | |||
| 1dd9ff51cf | |||
| 4b4dce1175 | |||
| d8fb77a2b6 | |||
| 8d6c8b62aa |
@@ -4,10 +4,10 @@ description: Atlantis map and simulation service
|
|||||||
type: application
|
type: application
|
||||||
# This is the chart version. This version number should be incremented each time you make changes
|
# This is the chart version. This version number should be incremented each time you make changes
|
||||||
# to the chart and its templates, including the app version.
|
# to the chart and its templates, including the app version.
|
||||||
version: v2.6.6
|
version: v1.42.23
|
||||||
# This is the version number of the application being deployed. This version number should be
|
# This is the version number of the application being deployed. This version number should be
|
||||||
# incremented each time you make changes to the application.
|
# incremented each time you make changes to the application.
|
||||||
appVersion: v2.6.6
|
appVersion: v1.42.23
|
||||||
dependencies:
|
dependencies:
|
||||||
- name: diagrid-dashboard
|
- name: diagrid-dashboard
|
||||||
version: "0.1.0"
|
version: "0.1.0"
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
replicaCount: 1
|
replicaCount: 1
|
||||||
image:
|
image:
|
||||||
repository: git.oceanbox.io/oceanbox/poseidon/atlantis
|
repository: git.oceanbox.io/oceanbox/poseidon/atlantis
|
||||||
tag: v2.6.6
|
tag: v1.42.23
|
||||||
pullPolicy: IfNotPresent
|
pullPolicy: IfNotPresent
|
||||||
init:
|
init:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
|||||||
@@ -13,9 +13,9 @@ type: application
|
|||||||
# This is the chart version. This version number should be incremented each time you make changes
|
# This is the chart version. This version number should be incremented each time you make changes
|
||||||
# to the chart and its templates, including the app version.
|
# to the chart and its templates, including the app version.
|
||||||
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||||
version: v2.6.6
|
version: v1.42.23
|
||||||
# This is the version number of the application being deployed. This version number should be
|
# This is the version number of the application being deployed. This version number should be
|
||||||
# incremented each time you make changes to the application. Versions are not expected to
|
# incremented each time you make changes to the application. Versions are not expected to
|
||||||
# follow Semantic Versioning. They should reflect the version the application is using.
|
# follow Semantic Versioning. They should reflect the version the application is using.
|
||||||
# It is recommended to use it with quotes.
|
# It is recommended to use it with quotes.
|
||||||
appVersion: "v2.6.6"
|
appVersion: "v1.42.23"
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ image:
|
|||||||
# This sets the pull policy for images.
|
# This sets the pull policy for images.
|
||||||
pullPolicy: IfNotPresent
|
pullPolicy: IfNotPresent
|
||||||
# Overrides the image tag whose default is the chart appVersion.
|
# Overrides the image tag whose default is the chart appVersion.
|
||||||
tag: v2.6.6
|
tag: v1.42.23
|
||||||
# This is for the secrets for pulling an image from a private repository more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
|
# This is for the secrets for pulling an image from a private repository more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
|
||||||
imagePullSecrets:
|
imagePullSecrets:
|
||||||
- name: gitlab-pull-secret
|
- name: gitlab-pull-secret
|
||||||
|
|||||||
@@ -4,10 +4,10 @@ description: A Helm chart for Kubernetes
|
|||||||
type: application
|
type: application
|
||||||
# This is the chart version. This version number should be incremented each time you make changes
|
# This is the chart version. This version number should be incremented each time you make changes
|
||||||
# to the chart and its templates, including the app version.
|
# to the chart and its templates, including the app version.
|
||||||
version: v2.6.6
|
version: v1.42.23
|
||||||
# This is the version number of the application being deployed. This version number should be
|
# This is the version number of the application being deployed. This version number should be
|
||||||
# incremented each time you make changes to the application.
|
# incremented each time you make changes to the application.
|
||||||
appVersion: v2.6.6
|
appVersion: v1.42.23
|
||||||
dependencies:
|
dependencies:
|
||||||
- name: diagrid-dashboard
|
- name: diagrid-dashboard
|
||||||
version: "0.1.0"
|
version: "0.1.0"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
replicaCount: 1
|
replicaCount: 1
|
||||||
image:
|
image:
|
||||||
repository: git.oceanbox.io/oceanbox/poseidon/sorcerer
|
repository: git.oceanbox.io/oceanbox/poseidon/sorcerer
|
||||||
tag: v2.6.6
|
tag: v1.42.23
|
||||||
pullPolicy: IfNotPresent
|
pullPolicy: IfNotPresent
|
||||||
init:
|
init:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ releases:
|
|||||||
- name: argocd
|
- name: argocd
|
||||||
namespace: argocd
|
namespace: argocd
|
||||||
chart: argo/argo-cd
|
chart: argo/argo-cd
|
||||||
version: 9.5.12
|
version: 9.5.15
|
||||||
condition: argo.enabled
|
condition: argo.enabled
|
||||||
values:
|
values:
|
||||||
- ../values/argo/values/argocd.yaml.gotmpl
|
- ../values/argo/values/argocd.yaml.gotmpl
|
||||||
@@ -27,7 +27,7 @@ releases:
|
|||||||
- name: argocd-apps
|
- name: argocd-apps
|
||||||
namespace: argocd
|
namespace: argocd
|
||||||
chart: argo/argocd-apps
|
chart: argo/argocd-apps
|
||||||
version: 2.0.4
|
version: 2.0.5
|
||||||
condition: argo.apps.enabled
|
condition: argo.apps.enabled
|
||||||
values:
|
values:
|
||||||
- ../values/argo/values/apps.yaml.gotmpl
|
- ../values/argo/values/apps.yaml.gotmpl
|
||||||
@@ -43,7 +43,7 @@ releases:
|
|||||||
- name: argo-workflows
|
- name: argo-workflows
|
||||||
namespace: argocd
|
namespace: argocd
|
||||||
chart: argo/argo-workflows
|
chart: argo/argo-workflows
|
||||||
version: 1.0.13
|
version: 1.0.14
|
||||||
condition: argo.workflows.enabled
|
condition: argo.workflows.enabled
|
||||||
missingFileHandler: Info
|
missingFileHandler: Info
|
||||||
- name: manifests
|
- name: manifests
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ releases:
|
|||||||
- name: jobset
|
- name: jobset
|
||||||
namespace: jobset-system
|
namespace: jobset-system
|
||||||
chart: jobset/jobset
|
chart: jobset/jobset
|
||||||
version: 0.12.0
|
version: 0.11.1
|
||||||
condition: jobset.enabled
|
condition: jobset.enabled
|
||||||
values:
|
values:
|
||||||
- ../values/jobset/values/jobset.yaml.gotmpl
|
- ../values/jobset/values/jobset.yaml.gotmpl
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ releases:
|
|||||||
- name: kyverno
|
- name: kyverno
|
||||||
namespace: kyverno
|
namespace: kyverno
|
||||||
chart: kyverno/kyverno
|
chart: kyverno/kyverno
|
||||||
version: 3.8.0
|
version: 3.8.1
|
||||||
condition: kyverno.enabled
|
condition: kyverno.enabled
|
||||||
values:
|
values:
|
||||||
- ../values/kyverno/values/kyverno.yaml.gotmpl
|
- ../values/kyverno/values/kyverno.yaml.gotmpl
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ releases:
|
|||||||
namespace: {{ .Environment.Name }}-openfga
|
namespace: {{ .Environment.Name }}-openfga
|
||||||
{{- end }}
|
{{- end }}
|
||||||
chart: openfga/openfga
|
chart: openfga/openfga
|
||||||
version: 0.3.3
|
version: 0.3.5
|
||||||
condition: openfga.enabled
|
condition: openfga.enabled
|
||||||
values:
|
values:
|
||||||
- ../values/openfga/values/values.yaml
|
- ../values/openfga/values/values.yaml
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ releases:
|
|||||||
- name: opentelemetry-collector
|
- name: opentelemetry-collector
|
||||||
namespace: otel
|
namespace: otel
|
||||||
chart: open-telemetry/opentelemetry-collector
|
chart: open-telemetry/opentelemetry-collector
|
||||||
version: 0.153.0
|
version: 0.156.2
|
||||||
condition: otel.enabled
|
condition: otel.enabled
|
||||||
values:
|
values:
|
||||||
- ../values/opentelemetry-collector/values/values.yaml
|
- ../values/opentelemetry-collector/values/values.yaml
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ releases:
|
|||||||
- name: postgres-operator
|
- name: postgres-operator
|
||||||
namespace: cnpg
|
namespace: cnpg
|
||||||
chart: cloudnative-pg/cloudnative-pg
|
chart: cloudnative-pg/cloudnative-pg
|
||||||
version: 0.28.0
|
version: 0.28.2
|
||||||
condition: postgres_operator.enabled
|
condition: postgres_operator.enabled
|
||||||
values:
|
values:
|
||||||
- ../values/postgres-operator/values/postgres-operator.yaml.gotmpl
|
- ../values/postgres-operator/values/postgres-operator.yaml.gotmpl
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ releases:
|
|||||||
- name: prometheus
|
- name: prometheus
|
||||||
namespace: prometheus
|
namespace: prometheus
|
||||||
chart: prometheus/kube-prometheus-stack
|
chart: prometheus/kube-prometheus-stack
|
||||||
version: 82.15.1
|
version: 85.3.0
|
||||||
condition: prometheus.enabled
|
condition: prometheus.enabled
|
||||||
values:
|
values:
|
||||||
- ../values/prometheus/values/prometheus.yaml.gotmpl
|
- ../values/prometheus/values/prometheus.yaml.gotmpl
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ releases:
|
|||||||
- name: umami
|
- name: umami
|
||||||
namespace: analytics
|
namespace: analytics
|
||||||
chart: umami/umami
|
chart: umami/umami
|
||||||
version: 7.9.1
|
version: 7.9.4
|
||||||
condition: umami.enabled
|
condition: umami.enabled
|
||||||
values:
|
values:
|
||||||
- ../values/umami/values/values.yaml
|
- ../values/umami/values/values.yaml
|
||||||
|
|||||||
@@ -3,7 +3,8 @@ bases:
|
|||||||
|
|
||||||
repositories:
|
repositories:
|
||||||
- name: x509-exporter
|
- name: x509-exporter
|
||||||
url: 'https://charts.enix.io'
|
oci: true
|
||||||
|
url: 'quay.io/enix/charts'
|
||||||
|
|
||||||
commonLabels:
|
commonLabels:
|
||||||
tier: sys
|
tier: sys
|
||||||
@@ -12,7 +13,7 @@ releases:
|
|||||||
- name: x509-exporter
|
- name: x509-exporter
|
||||||
namespace: x509-exporter
|
namespace: x509-exporter
|
||||||
chart: x509-exporter/x509-certificate-exporter
|
chart: x509-exporter/x509-certificate-exporter
|
||||||
version: 3.21.0
|
version: 4.1.0
|
||||||
condition: x509_exporter.enabled
|
condition: x509_exporter.enabled
|
||||||
values:
|
values:
|
||||||
- ../values/x509-exporter/values/x509-exporter.yaml.gotmpl
|
- ../values/x509-exporter/values/x509-exporter.yaml.gotmpl
|
||||||
|
|||||||
@@ -141,6 +141,7 @@ spec:
|
|||||||
- ghcr.io/spegel-org/helm-charts
|
- ghcr.io/spegel-org/helm-charts
|
||||||
- quay.io/cilium/charts
|
- quay.io/cilium/charts
|
||||||
- quay.io/jetstack/charts
|
- quay.io/jetstack/charts
|
||||||
|
- quay.io/enix/charts
|
||||||
- registry.k8s.io/jobset/charts/jobset
|
- registry.k8s.io/jobset/charts/jobset
|
||||||
- ghcr.io/dragonflydb/dragonfly-operator/helm/dragonfly-operator
|
- ghcr.io/dragonflydb/dragonfly-operator/helm/dragonfly-operator
|
||||||
- docker.gitea.com
|
- docker.gitea.com
|
||||||
|
|||||||
@@ -3,7 +3,8 @@ kind: ConfigMap
|
|||||||
metadata:
|
metadata:
|
||||||
name: beta-atlantis-actor-config
|
name: beta-atlantis-actor-config
|
||||||
data:
|
data:
|
||||||
XTRACT_IMAGE: "git.oceanbox.io/oceanbox/katamari/excavator:v1.2.8"
|
KUEUE_NAMESPACE: "prod-queue"
|
||||||
|
XTRACT_IMAGE: "git.oceanbox.io/oceanbox/katamari/excavator:v1.2.14"
|
||||||
XTRACT_QUEUE: "prod-queue"
|
XTRACT_QUEUE: "prod-queue"
|
||||||
PLUME_IMAGE: "git.oceanbox.io/oceanbox/katamari/plume:v1.2.8"
|
PLUME_IMAGE: "git.oceanbox.io/oceanbox/katamari/plume:v1.2.14"
|
||||||
PLUME_QUEUE: "prod-queue"
|
PLUME_QUEUE: "prod-queue"
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ kind: ConfigMap
|
|||||||
metadata:
|
metadata:
|
||||||
name: prod-atlantis-actor-config
|
name: prod-atlantis-actor-config
|
||||||
data:
|
data:
|
||||||
|
KUEUE_NAMESPACE: "prod-queue"
|
||||||
XTRACT_IMAGE: "git.oceanbox.io/oceanbox/katamari/excavator:v1.2.8"
|
XTRACT_IMAGE: "git.oceanbox.io/oceanbox/katamari/excavator:v1.2.8"
|
||||||
XTRACT_QUEUE: "prod-queue"
|
XTRACT_QUEUE: "prod-queue"
|
||||||
PLUME_IMAGE: "git.oceanbox.io/oceanbox/katamari/plume:v1.2.8"
|
PLUME_IMAGE: "git.oceanbox.io/oceanbox/katamari/plume:v1.2.8"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ kind: ConfigMap
|
|||||||
metadata:
|
metadata:
|
||||||
name: staging-atlantis-actor-config
|
name: staging-atlantis-actor-config
|
||||||
data:
|
data:
|
||||||
XTRACT_IMAGE: "git.oceanbox.io/oceanbox/katamari/excavator:v1.2.12"
|
XTRACT_IMAGE: "git.oceanbox.io/oceanbox/katamari/excavator:v1.2.14"
|
||||||
XTRACT_QUEUE: "dev-queue"
|
XTRACT_QUEUE: "dev-queue"
|
||||||
PLUME_IMAGE: "git.oceanbox.io/oceanbox/katamari/plume:v1.2.12"
|
PLUME_IMAGE: "git.oceanbox.io/oceanbox/katamari/plume:v1.2.14"
|
||||||
PLUME_QUEUE: "dev-queue"
|
PLUME_QUEUE: "dev-queue"
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ replicaCount: 1
|
|||||||
|
|
||||||
image:
|
image:
|
||||||
repository: git.oceanbox.io/oceanbox/poseidon/atlantis
|
repository: git.oceanbox.io/oceanbox/poseidon/atlantis
|
||||||
tag: v2.6.6
|
tag: v2.8.0
|
||||||
|
|
||||||
podAnnotations:
|
podAnnotations:
|
||||||
dapr.io/app-id: "beta-atlantis"
|
dapr.io/app-id: "beta-atlantis"
|
||||||
@@ -11,7 +11,7 @@ env:
|
|||||||
- name: APP_NAMESPACE
|
- name: APP_NAMESPACE
|
||||||
value: beta-atlantis
|
value: beta-atlantis
|
||||||
- name: APP_VERSION
|
- name: APP_VERSION
|
||||||
value: "2.6.6-beta"
|
value: "2.8.0-beta"
|
||||||
- name: LOG_LEVEL
|
- name: LOG_LEVEL
|
||||||
value: "1"
|
value: "1"
|
||||||
- name: ANALYTICS_WEB_ID
|
- name: ANALYTICS_WEB_ID
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
replicaCount: 1
|
replicaCount: 1
|
||||||
image:
|
image:
|
||||||
repository: git.oceanbox.io/oceanbox/poseidon/atlantis
|
repository: git.oceanbox.io/oceanbox/poseidon/atlantis
|
||||||
tag: 0042495a-debug
|
tag: d46af365-debug
|
||||||
podAnnotations:
|
podAnnotations:
|
||||||
dapr.io/app-id: "staging-atlantis"
|
dapr.io/app-id: "staging-atlantis"
|
||||||
env:
|
env:
|
||||||
|
|||||||
@@ -38,4 +38,4 @@ volumeMounts:
|
|||||||
readOnly: true
|
readOnly: true
|
||||||
subPath: appsettings.json
|
subPath: appsettings.json
|
||||||
image:
|
image:
|
||||||
tag: 0042495a-debug
|
tag: 10c7cef3-debug
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
replicaCount: 1
|
replicaCount: 1
|
||||||
image:
|
image:
|
||||||
tag: "5e339995-debug"
|
tag: "4147901d-debug"
|
||||||
env:
|
env:
|
||||||
- name: APP_VERSION
|
- name: APP_VERSION
|
||||||
value: "0.0.0"
|
value: "0.0.0"
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
image:
|
image:
|
||||||
repository: twinproduction/gatus
|
repository: twinproduction/gatus
|
||||||
tag: v5.35.0
|
tag: v5.36.0
|
||||||
|
|
||||||
# Does envFrom secret named gatus
|
# Does envFrom secret named gatus
|
||||||
secrets: true
|
secrets: true
|
||||||
|
|||||||
@@ -1,3 +1,42 @@
|
|||||||
|
---
|
||||||
|
apiVersion: v1
|
||||||
|
kind: PersistentVolume
|
||||||
|
metadata:
|
||||||
|
name: pv-prod-queue-ceph-archives
|
||||||
|
spec:
|
||||||
|
accessModes:
|
||||||
|
- ReadWriteMany
|
||||||
|
capacity:
|
||||||
|
storage: 1Gi
|
||||||
|
csi:
|
||||||
|
driver: rook-ceph.cephfs.csi.ceph.com
|
||||||
|
nodeStageSecretRef:
|
||||||
|
name: rook-csi-cephfs-node
|
||||||
|
namespace: rook-ceph
|
||||||
|
volumeAttributes:
|
||||||
|
clusterID: rook-ceph
|
||||||
|
fsName: data
|
||||||
|
rootPath: /
|
||||||
|
staticVolume: "true"
|
||||||
|
volumeHandle: pv-prod-queue-ceph-archives
|
||||||
|
persistentVolumeReclaimPolicy: Retain
|
||||||
|
volumeMode: Filesystem
|
||||||
|
---
|
||||||
|
apiVersion: v1
|
||||||
|
kind: PersistentVolumeClaim
|
||||||
|
metadata:
|
||||||
|
name: prod-queue-ceph-archives
|
||||||
|
namespace: prod-queue
|
||||||
|
spec:
|
||||||
|
accessModes:
|
||||||
|
- ReadWriteMany
|
||||||
|
resources:
|
||||||
|
requests:
|
||||||
|
storage: 1Gi
|
||||||
|
storageClassName: ""
|
||||||
|
volumeMode: Filesystem
|
||||||
|
volumeName: pv-prod-queue-ceph-archives
|
||||||
|
---
|
||||||
# Cross-namespace RBAC: allow sorcerer ServiceAccounts to manage JobSets in dev-queue
|
# Cross-namespace RBAC: allow sorcerer ServiceAccounts to manage JobSets in dev-queue
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
kind: Role
|
kind: Role
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
path: /spec/template/spec/containers/0/envFrom/-
|
path: /spec/template/spec/containers/0/envFrom/-
|
||||||
value:
|
value:
|
||||||
secretRef:
|
secretRef:
|
||||||
name: prod-sorcerer-env
|
name: beta-sorcerer-env
|
||||||
- op: add
|
- op: add
|
||||||
path: /spec/template/spec/containers/0/envFrom/-
|
path: /spec/template/spec/containers/0/envFrom/-
|
||||||
value:
|
value:
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ replicaCount: 1
|
|||||||
|
|
||||||
image:
|
image:
|
||||||
repository: git.oceanbox.io/oceanbox/poseidon/sorcerer
|
repository: git.oceanbox.io/oceanbox/poseidon/sorcerer
|
||||||
tag: v2.6.6
|
tag: v2.8.0
|
||||||
|
|
||||||
podAnnotations:
|
podAnnotations:
|
||||||
dapr.io/enabled: "true"
|
dapr.io/enabled: "true"
|
||||||
@@ -19,7 +19,7 @@ podAnnotations:
|
|||||||
|
|
||||||
env:
|
env:
|
||||||
- name: APP_VERSION
|
- name: APP_VERSION
|
||||||
value: "2.6.6-beta"
|
value: "2.8.0-beta"
|
||||||
- name: LOG_LEVEL
|
- name: LOG_LEVEL
|
||||||
value: "1"
|
value: "1"
|
||||||
- name: REDIS_USER
|
- name: REDIS_USER
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
replicaCount: 1
|
replicaCount: 1
|
||||||
image:
|
image:
|
||||||
repository: git.oceanbox.io/oceanbox/poseidon/sorcerer
|
repository: git.oceanbox.io/oceanbox/poseidon/sorcerer
|
||||||
tag: 0042495a-debug
|
tag: f583579d-debug
|
||||||
podAnnotations:
|
podAnnotations:
|
||||||
dapr.io/enabled: "true"
|
dapr.io/enabled: "true"
|
||||||
dapr.io/app-id: "staging-sorcerer"
|
dapr.io/app-id: "staging-sorcerer"
|
||||||
|
|||||||
@@ -23,8 +23,8 @@ SELECT
|
|||||||
*
|
*
|
||||||
FROM
|
FROM
|
||||||
crosstab(
|
crosstab(
|
||||||
'SELECT "group", sim_type, count::text FROM weekly_sim_submit_count_v2 ORDER BY 1, 2',
|
'SELECT "group", sim_type, count::text FROM weekly_sim_submit_count WHERE sim_type <> ''lice-network'' AND sim_type <> ''lice-delousing'' ORDER BY 1, 2',
|
||||||
'SELECT DISTINCT sim_type FROM weekly_sim_submit_count_v2 ORDER BY 1'
|
'SELECT DISTINCT sim_type FROM weekly_sim_submit_count WHERE sim_type <> ''lice-network'' AND sim_type <> ''lice-delousing'' ORDER BY 1'
|
||||||
) AS ct (
|
) AS ct (
|
||||||
group_name text,
|
group_name text,
|
||||||
lice bigint,
|
lice bigint,
|
||||||
@@ -33,3 +33,9 @@ FROM
|
|||||||
virus bigint,
|
virus bigint,
|
||||||
watercontact bigint
|
watercontact bigint
|
||||||
)
|
)
|
||||||
|
WHERE
|
||||||
|
(lice + sedimentation + transport + virus + watercontact) <> 0
|
||||||
|
AND "group" <> '@oceanbox.io'
|
||||||
|
ORDER BY
|
||||||
|
(lice + sedimentation + transport + virus + watercontact) DESC
|
||||||
|
;
|
||||||
|
|||||||
@@ -9,9 +9,11 @@ WITH base AS (
|
|||||||
WHERE
|
WHERE
|
||||||
w.website_id = '16e7d807-4db5-45fd-92a9-27393445a153'
|
w.website_id = '16e7d807-4db5-45fd-92a9-27393445a153'
|
||||||
AND w.event_type = 1
|
AND w.event_type = 1
|
||||||
AND w.created_at BETWEEN '2025-10-13' AND '2025-10-19'
|
-- NOTE: This is only available in grafana
|
||||||
|
-- AND $__timeFilter(w.created_at)
|
||||||
|
AND w.created_at BETWEEN current_timestamp - '7 days'::interval and current_timestamp
|
||||||
AND s.distinct_id IS NOT NULL
|
AND s.distinct_id IS NOT NULL
|
||||||
-- AND substring(s.distinct_id SIMILAR '%#"@%#"' ESCAPE '#') IN ('@leroyseafood.com')
|
-- AND substring(s.distinct_id SIMILAR '%#"@%#"' ESCAPE '#') IN ($groups)
|
||||||
),
|
),
|
||||||
unique_totals AS (
|
unique_totals AS (
|
||||||
SELECT
|
SELECT
|
||||||
@@ -28,9 +30,12 @@ unique_users AS (
|
|||||||
GROUP BY "Group"
|
GROUP BY "Group"
|
||||||
)
|
)
|
||||||
SELECT
|
SELECT
|
||||||
SUM("Users in range")
|
t."Group",
|
||||||
FROM
|
t."Users in range" AS "Weekly users"
|
||||||
unique_totals
|
FROM unique_totals t
|
||||||
|
LEFT JOIN
|
||||||
|
unique_users u USING ("Group")
|
||||||
WHERE
|
WHERE
|
||||||
LOWER("Group") NOT IN ('@oceanbox.io')
|
t."Group" <> '@oceanbox.io'
|
||||||
;
|
ORDER BY
|
||||||
|
"Users in range" DESC;
|
||||||
|
|||||||
@@ -14,6 +14,10 @@ WHERE
|
|||||||
AND w.event_type = 1
|
AND w.event_type = 1
|
||||||
AND s.distinct_id IS NOT NULL
|
AND s.distinct_id IS NOT NULL
|
||||||
AND substring(s.distinct_id SIMILAR '%#"@%#"' ESCAPE '#') <> '@oceanbox.io'
|
AND substring(s.distinct_id SIMILAR '%#"@%#"' ESCAPE '#') <> '@oceanbox.io'
|
||||||
|
AND 2025 < EXTRACT(YEAR FROM w.created_at)
|
||||||
|
-- NOTE(simkir): We started with umami at this time, so the data that week was not complete
|
||||||
|
AND (NOT (EXTRACT(YEAR FROM w.created_at) = 2025 AND EXTRACT(WEEK FROM w.created_at) = 37))
|
||||||
|
AND (NOT (EXTRACT(YEAR FROM w.created_at) = 2025 AND EXTRACT(WEEK FROM w.created_at) = 1))
|
||||||
GROUP BY
|
GROUP BY
|
||||||
week
|
week
|
||||||
ORDER BY
|
ORDER BY
|
||||||
|
|||||||
Reference in New Issue
Block a user