Skip to content

Commit

Permalink
Feat/fleet dasbhoards (#35)
Browse files Browse the repository at this point in the history 
* chore: use release name for label

Signed-off-by: Bruno Bressi <[email protected]>

* chore: bumped to latest prom crds

* chore: removed uneeded instruction in make chart

The dependencies are already updated, no need to run the command again.

* fix: removed pinned images

The pinning of the images practically blocked the update of most
components.

* chore: removed unused value

Signed-off-by: Bruno Bressi <[email protected]>

* feat: added rancher-monitoring RBAC & smon

This commit adds the necessary templates to be able to parse the rancher
deployments metrics. The resources were copied from the official
rancher-monitoring chart.

The default behavior should be not to activate this monitoring, because
the chart is typically deployed in downstream clusters, which don't have
any rancher deployments.

* feat: added fleet grafana dashboards

The dashboards and the "exporter" were copied from the official
rancher-monitoring chart.

* fix: added missing release label

Signed-off-by: Bruno Bressi <[email protected]>

* chore: rc9

Signed-off-by: Bruno Bressi <[email protected]>

* chore: rc0 for 1.0.0

Signed-off-by: Bruno Bressi <[email protected]>

* chore: rc1 for 1.0.0

Signed-off-by: Bruno Bressi <[email protected]>

---------

Signed-off-by: Bruno Bressi <[email protected]>
  • Loading branch information
@puffitos
puffitos authored Jan 23, 2025
1 parent 6859fa7 commit 5d37391
Show file tree
Hide file tree
Showing 11 changed files with 2,267 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ annotations:
catalog.cattle.io/display-name: CaaS Cluster Monitoring V3
name: caas-cluster-monitoring
description: A Helm chart for Rancher Cluster Monitoring V3
version: "1.0.0-rc1"
version: "1.0.0-rc9"
appVersion: "68.1.1"
icon: https://raw.githubusercontent.com/caas-team/caas-project-monitoring/main/logo.png
keywords:
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ The installation can be configured using the various parameters defined in the `
| `caas.grafana.dashboards.longhorn` | bool | `true` | whether to deploy the rancher longhorn dashboard |
| `caas.grafana.dashboards.nginxIngress` | bool | `true` | whether to deploy the nginx ingress controller dashboard |
| `caas.grafana.dashboards.rancherCluster` | bool | `true` | whether to deploy the rancher cluster dashboards |
| `caas.grafana.dashboards.rancherFleet` | bool | `true` | whether to deploy the rancher fleet dashboard |
| `caas.grafana.dashboards.rancherHome` | bool | `true` | whether to deploy the rancher home dashboard |
| `caas.grafana.dashboards.rancherK8sComponents` | bool | `true` | whether to deploy the rancher k8s components dashboard |
| `caas.grafana.dashboards.rancherNodes` | bool | `true` | whether to deploy the rancher nodes dashboard |
Expand Down
246 changes: 246 additions & 0 deletions files/rancher/fleet/bundle.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,246 @@
{
"description": "Bundle",
"graphTooltip": 1,
"panels": [
{
"datasource": {
"type": "datasource",
"uid": "-- Mixed --"
},
"fieldConfig": {
"defaults": {
"decimals": 0,
"unit": "percentunit"
}
},
"gridPos": {
"h": 5,
"w": 7,
"x": 0,
"y": 0
},
"id": 1,
"pluginVersion": "v11.0.0",
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"expr": "sum(fleet_bundle_ready{exported_namespace=\"$namespace\",name=~\"$name\"}) / sum(fleet_bundle_desired_ready{exported_namespace=\"$namespace\",name=~\"$name\"})"
}
],
"title": "Ready Bundles",
"type": "stat"
},
{
"datasource": {
"type": "datasource",
"uid": "-- Mixed --"
},
"fieldConfig": {
"defaults": {
"decimals": 0,
"unit": null
}
},
"gridPos": {
"h": 5,
"w": 17,
"x": 7,
"y": 0
},
"id": 2,
"pluginVersion": "v11.0.0",
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"expr": "sum(fleet_bundle_desired_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
"legendFormat": "Desired Ready"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"expr": "sum(fleet_bundle_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
"legendFormat": "Ready"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"expr": "sum(fleet_bundle_not_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
"legendFormat": "Not Ready"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"expr": "sum(fleet_bundle_out_of_sync{exported_namespace=\"$namespace\",name=~\"$name\"})",
"legendFormat": "Out of Sync"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"expr": "sum(fleet_bundle_err_applied{exported_namespace=\"$namespace\",name=~\"$name\"})",
"legendFormat": "Err Applied"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"expr": "sum(fleet_bundle_modified{exported_namespace=\"$namespace\",name=~\"$name\"})",
"legendFormat": "Modified"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"expr": "sum(fleet_bundle_pending{exported_namespace=\"$namespace\",name=~\"$name\"})",
"legendFormat": "Pending"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"expr": "sum(fleet_bundle_wait_applied{exported_namespace=\"$namespace\",name=~\"$name\"})",
"legendFormat": "Wait Applied"
}
],
"title": "Bundles",
"type": "stat"
},
{
"datasource": {
"type": "datasource",
"uid": "-- Mixed --"
},
"fieldConfig": {
"defaults": {
"decimals": 0,
"unit": null
}
},
"gridPos": {
"h": 8,
"w": 24,
"x": 0,
"y": 8
},
"id": 3,
"pluginVersion": "v11.0.0",
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"expr": "sum(fleet_bundle_desired_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
"legendFormat": "Desired Ready"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"expr": "sum(fleet_bundle_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
"legendFormat": "Ready"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"expr": "sum(fleet_bundle_not_ready{exported_namespace=\"$namespace\",name=~\"$name\"})",
"legendFormat": "Not Ready"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"expr": "sum(fleet_bundle_out_of_sync{exported_namespace=\"$namespace\",name=~\"$name\"})",
"legendFormat": "Out of Sync"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"expr": "sum(fleet_bundle_err_applied{exported_namespace=\"$namespace\",name=~\"$name\"})",
"legendFormat": "Err Applied"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"expr": "sum(fleet_bundle_modified{exported_namespace=\"$namespace\",name=~\"$name\"})",
"legendFormat": "Modified"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"expr": "sum(fleet_bundle_pending{exported_namespace=\"$namespace\",name=~\"$name\"})",
"legendFormat": "Pending"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"expr": "sum(fleet_bundle_wait_applied{exported_namespace=\"$namespace\",name=~\"$name\"})",
"legendFormat": "Wait Applied"
}
],
"title": "Bundles",
"type": "timeseries"
}
],
"schemaVersion": 39,
"templating": {
"list": [
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"name": "namespace",
"query": "label_values(fleet_bundle_desired_ready, exported_namespace)",
"refresh": 2,
"type": "query"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"includeAll": true,
"name": "name",
"query": "label_values(fleet_bundle_desired_ready{exported_namespace=~\"$namespace\"}, name)",
"refresh": 2,
"type": "query"
}
]
},
"time": {
"from": "now-1h",
"to": "now"
},
"timezone": "utc",
"title": "Fleet / Bundle",
"uid": "fleet-bundle"
}
Loading

0 comments on commit 5d37391

Please sign in to comment.