Merge branch 'main' into 'enterprise'

Sync from open source to enterprise

See merge request dkinternal/observability/dataops-observability!26

Author: aarthy-dk

.github/actions/publish_charts/action.yaml

@@ -0,0 +1,31 @@
+name: Publish Charts
+description: Push charts to GitHub Pages
+inputs:
+  github-token:
+    description: 'GitHub token for pushing to gh-pages branch'
+    required: true
+runs:
+  using: 'composite'
+  steps:
+    - name: Configure Git
+      shell: bash
+      run: |
+        git config user.name "$GITHUB_ACTOR"
+        git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
+
+    - name: Install Helm
+      uses: azure/setup-helm@v4.2.0
+
+    - name: Add Helm Repos for Dependencies
+      shell: bash
+      run: |
+        helm repo add bitnami https://charts.bitnami.com/bitnami
+
+    - name: Run chart-releaser
+      uses: helm/chart-releaser-action@v1.6.0
+      with:
+        charts_dir: deploy/charts
+        skip_existing: 'true'
+        packages_with_index: 'true'
+      env:
+        CR_TOKEN: '${{ inputs.github-token }}'

.github/workflows/release.yaml

@@ -0,0 +1,21 @@
+name: Release New Version
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+    branches:
+      - master
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Latest Changes
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Package and Publish Charts
+        uses: ./.github/actions/publish_charts
+        with:
+          github-token: '${{ secrets.GITHUB_TOKEN }}'

.gitignore

@@ -156,9 +156,6 @@ events_v2.html
 # MacOS
 *.DS_STORE
 
-# Helm charts packages
-*.tgz
-
 # Diff/merge files
 *.orig
 

deploy/charts/observability-app/values.yaml

@@ -1,5 +1,5 @@
 #
-# Values for minikube trial deployment
+# Values for minikube dk-installer deployment
 #
 
 observability:

deploy/charts/observability-services/values.yaml

@@ -18,7 +18,6 @@ kafka:
     image:
       tag: 3.8.4-debian-12-r0
 
-
 mysql:
   enable: true
   image:
@@ -28,4 +27,3 @@ mysql:
   auth:
     username: observability
     database: datakitchen
-

observability_ui/apps/shell/src/app/projects/integrations/tools/abstract-tool.directive.ts

@@ -229,7 +229,7 @@ export abstract class AbstractTool implements OnInit {
 
     for (const variableName of variables) {
       const variableValue = variablesValues[variableName];
-      dockerExtraEnvVars.push(`      - ${variableName.toUpperCase()}='${variableValue}'\n`);
+      dockerExtraEnvVars.push(`      - ${variableName.toUpperCase()}=${variableValue}\n`);
       kubernetesExtraEnvVars.push(`  ${variableName.toUpperCase()}: '${variableValue}'\n`);
     }
 

observability_ui/apps/shell/src/app/projects/integrations/tools/agent-script.tpl

@@ -120,18 +120,18 @@ services:
     extra_hosts:
       - host.docker.internal:host-gateway
     environment:
-      - EVENTS_API_HOST='$EVENTS_API_HOST'
-      - EVENTS_API_KEY='$EVENTS_API_KEY'
-      - EVENT_HUB_CONN_STR='$EVENT_HUB_CONN_STR'
-      - EVENT_HUB_NAME='$EVENT_HUB_NAME'
-      - AZURE_STORAGE_CONN_STR='$AZURE_STORAGE_CONN_STR'
-      - BLOB_CONTAINER_NAME='$BLOB_CONTAINER_NAME'
-      - EXTERNAL_PLUGINS_PATH='$EXTERNAL_PLUGINS_PATH'
-      - ENABLED_PLUGINS='$ENABLED_PLUGINS'
-      - PUBLISH_EVENTS='$PUBLISH_EVENTS'
-      - AIRFLOW_PASSWORD='$AIRFLOW_PASSWORD'
-      - AIRFLOW_USERNAME='$AIRFLOW_USERNAME'
-      - BASE_AIRFLOW_API_URL='$BASE_AIRFLOW_API_URL'
+      - EVENTS_API_HOST=$EVENTS_API_HOST
+      - EVENTS_API_KEY=$EVENTS_API_KEY
+      - EVENT_HUB_CONN_STR=$EVENT_HUB_CONN_STR
+      - EVENT_HUB_NAME=$EVENT_HUB_NAME
+      - AZURE_STORAGE_CONN_STR=$AZURE_STORAGE_CONN_STR
+      - BLOB_CONTAINER_NAME=$BLOB_CONTAINER_NAME
+      - EXTERNAL_PLUGINS_PATH=$EXTERNAL_PLUGINS_PATH
+      - ENABLED_PLUGINS=$ENABLED_PLUGINS
+      - PUBLISH_EVENTS=$PUBLISH_EVENTS
+      - AIRFLOW_PASSWORD=$AIRFLOW_PASSWORD
+      - AIRFLOW_USERNAME=$AIRFLOW_USERNAME
+      - BASE_AIRFLOW_API_URL=$BASE_AIRFLOW_API_URL
 $DOCKER_EXTRA_ENV_VARS
 
 EOF

pyproject.toml

@@ -46,6 +46,7 @@ dependencies = [
     "tomli==2.0.1",
     "Werkzeug==2.2.3",
     "WTForms==3.0.1",
+    "yoyo-migrations~=8.2.0",
 ]
 
 [project.optional-dependencies]