Skip to content

Commit 96e83c7

Browse files
authored
Split of cluster and host metrics dashboards and deployments (#5)
* Split of dashboards and deployment scripts for host and cluster metrics (#1) - separated cluster and host metrics dashboards and deployment scripts - resize dashboards - modified readme * added consolidated dashboard
1 parent c751705 commit 96e83c7

11 files changed

+1156
-232
lines changed

.github/workflows/build-monitoring.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
resourceGroup: rg-${{ inputs.vmName }}
2626
clusterName: ${{ inputs.clusterName }}
2727
vmName: ${{ inputs.vmName }}
28-
grafanaDashboardName: footprint-${{github.run_id}}
28+
grafanaName: footprint-${{github.run_id}}
2929
monitorName: footprint
3030
logAnalytics: la-footprint
3131
steps:
@@ -44,6 +44,6 @@ jobs:
4444
az provider register --namespace Microsoft.AlertsManagement --wait
4545
az extension add --name amg
4646
- name: Create Azure Monitor and Grafana resources
47-
run: bash ${GITHUB_WORKSPACE}/scripts/configure-azmon-grafana.sh -v $vmName -g $resourceGroup -m $monitorName -d $grafanaDashboardName -c $clusterName
47+
run: bash ${GITHUB_WORKSPACE}/scripts/configure-azmon-grafana.sh -v $vmName -g $resourceGroup -m $monitorName -d $grafanaName -c $clusterName
4848
- name: Configure hostmemusage collection
4949
run: bash ${GITHUB_WORKSPACE}/scripts/configure-vm-hostmemusage-collector.sh -g $resourceGroup -v $vmName -l $logAnalytics -m $monitorName

.github/workflows/build-vm.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ jobs:
191191
--name CustomScriptExtension \
192192
--publisher Microsoft.Compute \
193193
--force-update \
194-
--settings "{\"commandToExecute\":\"powershell Get-AksEdgeKubeConfig -KubeConfigPath C:\\Scripts -Confirm:\$false; \
194+
--settings "{\"commandToExecute\":\"powershell q -Confirm:\$false; \
195195
kubectl get pods -A -v6 --kubeconfig C:\\scripts\\config; \
196196
az login --identity; \
197197
az extension add --name connectedk8s --version 1.6.0; \
@@ -215,7 +215,7 @@ jobs:
215215
kubectl delete node \$(kubectl get nodes | grep NotReady | awk '{print \$1}') && \
216216
kubectl config use-context default && \
217217
kubectl get pods -A -v6 && \
218-
decodedSecret=$(echo $encodedBase64Secret | base64 -d) && \
218+
decodedSecret=\$(echo $encodedBase64Secret | base64 -d) && \
219219
az login --service-principal -u ${{ secrets.AZURE_SP_CLIENT_ID }} -p \"\"\$decodedSecret\"\" --tenant $tenantId && \
220220
az extension add --name connectedk8s --version 1.6.0 && \
221221
az extension add --name azure-iot-ops && \

.github/workflows/create-tag.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
with:
1414
fetch-depth: 0
1515
- name: Install GitVersion
16-
uses: gittools/actions/gitversion/setup@v0.11.0
16+
uses: gittools/actions/gitversion/setup@v1.0.0
1717
with:
1818
versionSpec: '5.x'
1919
- name: Determine Version
20-
uses: gittools/actions/gitversion/execute@v0.11.0
20+
uses: gittools/actions/gitversion/execute@v1.0.0
2121
with:
2222
useConfigFile: true
2323
- name: Create git tag
@@ -26,4 +26,4 @@ jobs:
2626
if: github.ref == 'refs/heads/main'
2727
- name: Push git tag
2828
run: git push origin ${{ env.GitVersion_MajorMinorPatch }}
29-
if: github.ref == 'refs/heads/main'
29+
if: github.ref == 'refs/heads/main'

README.md

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Optimization for Arc memory footprintview
1+
# Optimization for Arc memory footprint
22

33
This repository sets up the infrastructure to create vhdx images and VMs for the Arc memory footprint investigations.
44
Because of the nature of efficiency, customers demand a low memory footprint to save costs in terms of hardware and devices.
@@ -149,6 +149,10 @@ id=$(az ad signed-in-user show --query id -o tsv)
149149
az role assignment create --assignee $id --role "Grafana Admin"
150150
```
151151

152-
The following is a screengrab of the dashboard available at `Dashboards > Footprint Dashboards > Memory Footprint`:
152+
Two dashboards are available in the `Footprint Dashboards` folder:
153153

154-
<img src='img/dashboard.png'>
154+
- *Memory Footprint - Cluster*: This dashboard shows the memory usage of the cluster including AIO and Arc resources.
155+
<img src='img/dashboard-cluster.png'>
156+
157+
- *Memory Footprint - Host*: This dashboard shows the memory usage of the VM (host) processes.
158+
<img src='img/dashboard-host.png'>

img/dashboard-cluster.png

286 KB
Loading

img/dashboard-host.png

245 KB
Loading

0 commit comments

Comments
 (0)