diff --git a/.github/workflows/dapr-longhaul-nightly.yml b/.github/workflows/dapr-longhaul-nightly.yml index ae15b726..10cdef6a 100644 --- a/.github/workflows/dapr-longhaul-nightly.yml +++ b/.github/workflows/dapr-longhaul-nightly.yml @@ -103,9 +103,10 @@ jobs: helm list -n ${{ env.DAPR_MONITORING }} | grep grafana && echo "GRAF_PRESENT=true" >> $GITHUB_ENV || echo "Grafana not present." - name: Preparing ${{ env.TEST_CLUSTER }} cluster for test by installing grafana if not present if: env.TEST_CLUSTER != '' && env.GRAF_PRESENT != 'true' + working-directory: ./longhaul run: | helm repo add grafana https://grafana.github.io/helm-charts - helm upgrade --install grafana grafana/grafana -n ${{ env.DAPR_MONITORING }} + helm upgrade --install grafana grafana/grafana -n ${{ env.DAPR_MONITORING }} -f ./grafana-config/values.yaml kubectl get pods -n ${{ env.DAPR_MONITORING }} - name: check if prometheus already exists if: env.TEST_CLUSTER != '' @@ -113,9 +114,10 @@ jobs: helm list -n ${{ env.DAPR_MONITORING }} | grep prometheus && echo "PROM_PRESENT=true" >> $GITHUB_ENV || echo "Prometheus not present." - name: Preparing ${{ env.TEST_CLUSTER }} cluster for test by installing prometheus if not present if: env.TEST_CLUSTER != '' && env.PROM_PRESENT != 'true' + working-directory: ./longhaul run: | helm repo add prometheus-community https://prometheus-community.github.io/helm-charts - helm upgrade --install dapr-prom prometheus-community/prometheus -n ${{ env.DAPR_MONITORING }} --version 14.12.0 --set server.retention="30d" + helm upgrade --install dapr-prom prometheus-community/prometheus -n ${{ env.DAPR_MONITORING }} -f ./prometheus-config/values.yaml --version 14.12.0 --set server.retention="30d" --set server.remoteWrite[0].basic_auth.password="${{ secrets.GRAFANA_PROM_KEY }}" kubectl get pods -n ${{ env.DAPR_MONITORING }} # Deploy dapr to k8s - name: Create dapr namespace, if it doesn't exist diff --git a/grafana-config/values.yaml b/grafana-config/values.yaml new file mode 100644 index 00000000..896c6378 --- /dev/null +++ b/grafana-config/values.yaml @@ -0,0 +1,3 @@ +grafana.ini: + feature_toggles: + publicDashboards: true \ No newline at end of file diff --git a/prometheus-config/values.yaml b/prometheus-config/values.yaml new file mode 100644 index 00000000..17e336dd --- /dev/null +++ b/prometheus-config/values.yaml @@ -0,0 +1,5 @@ +server: + remoteWrite: + - url: "https://prometheus-us-central2.grafana.net/api/prom/push" + basic_auth: + username: 677259 \ No newline at end of file