fixed monitoring (#8)

- fixed dashboards
- fixed monitoring setup parameters that were mixed up
- removed version for cli extension

Author: bindsi

.github/workflows/build-monitoring.yaml

@@ -44,6 +44,6 @@ jobs:
         az provider register --namespace Microsoft.AlertsManagement --wait
         az extension add --name amg
     - name: Create Azure Monitor and Grafana resources
-      run: bash ${GITHUB_WORKSPACE}/scripts/configure-azmon-grafana.sh -v $vmName -g $resourceGroup -m $monitorName -d $grafanaName -c $clusterName
+      run: bash ${GITHUB_WORKSPACE}/scripts/configure-azmon-grafana.sh -g $resourceGroup -m $monitorName -d $grafanaName -c $clusterName
     - name: Configure hostmemusage collection
-      run: bash ${GITHUB_WORKSPACE}/scripts/configure-vm-hostmemusage-collector.sh -g $resourceGroup -l $logAnalytics -m $monitorName
+      run: bash ${GITHUB_WORKSPACE}/scripts/configure-vm-hostmemusage-collector.sh -v $vmName -g $resourceGroup -l $logAnalytics -m $monitorName

.github/workflows/build-vm.yaml

@@ -194,7 +194,7 @@ jobs:
             --settings "{\"commandToExecute\":\"powershell q -Confirm:\$false; \
                 kubectl get pods -A -v6 --kubeconfig C:\\scripts\\config; \
                 az login --identity; \
-                az extension add --name connectedk8s --version 1.6.0; \
+                az extension add --name connectedk8s; \
                 az extension add --name azure-iot-ops; \
                 az connectedk8s connect --debug -n $clusterName -l $location -g $resourceGroup --kube-config C:\\Scripts\\config --subscription $subscriptionId; \
                 Remove-Item -LiteralPath C:\\Windows\\System32\\config\\systemprofile\\.azure\\AzureArcCharts -Recurse -Force; \
@@ -217,7 +217,7 @@ jobs:
                 kubectl get pods -A -v6 && \
                 decodedSecret=\$(echo $encodedBase64Secret | base64 -d) && \
                 az login --service-principal -u ${{ secrets.AZURE_SP_CLIENT_ID }} -p \"\"\$decodedSecret\"\" --tenant $tenantId && \
-                az extension add --name connectedk8s --version 1.6.0 && \
+                az extension add --name connectedk8s && \
                 az extension add --name azure-iot-ops && \
                 az connectedk8s connect --debug -n $clusterName -l $location -g $resourceGroup --subscription $subscriptionId && \
                 az connectedk8s enable-features --debug -n $clusterName -g $resourceGroup --custom-locations-oid \"\"${{ secrets.CUSTOM_LOCATIONS_OBJECT_ID }}\"\" --features cluster-connect custom-locations && \

scripts/configure-vm-hostmemusage-collector.sh

@@ -69,10 +69,12 @@ else
   echo "Grafana resource ($grafanaName) found. Use existing..."
 fi
 
-hostDashboardName="Memory Footprint - Host"
 allDashboardName="Memory Footprint"
+hostDashboardName="Memory Footprint - Host"
 echo "Creating grafana dashboard..."
+sed -i "s/##SUBSCRIPTION_ID##/$subscriptionId/g" monitoring/mem_by_all.json
 sed -i "s/##SUBSCRIPTION_ID##/$subscriptionId/g" monitoring/mem_by_proc.json
+sed -i "s/##RESOURCE_GROUP##/$resourceGroup/g" monitoring/mem_by_all.json
 sed -i "s/##RESOURCE_GROUP##/$resourceGroup/g" monitoring/mem_by_proc.json
 if [ $osType == "Linux" ]; then
   ts_query='CgroupMem_CL\\r\\n| where $__timeFilter(TimeGenerated)\\r\\n| summarize Memory=sum(MemoryUsage) by PodName, Namespace, TimeGenerated\\r\\n| project Memory, Workload=strcat(Namespace, \\"/\\", PodName), TimeGenerated\\r\\n| order by TimeGenerated asc\\r\\n'