Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/fleet dasbhoards #35

Merged
merged 14 commits into from
Jan 23, 2025
Merged

Feat/fleet dasbhoards #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9c354ee
chore: use release name for label
puffitos Jan 22, 2025
58ff7de
chore: bumped to latest prom crds
puffitos Jan 22, 2025
cbe7c0a
chore: removed uneeded instruction in make chart
puffitos Jan 22, 2025
080f1cf
fix: removed pinned images
puffitos Jan 22, 2025
f2b061c
chore: removed unused value
puffitos Jan 22, 2025
ed3c4b7
feat: added rancher-monitoring RBAC & smon
puffitos Jan 22, 2025
12dd5c3
feat: added fleet grafana dashboards
puffitos Jan 22, 2025
7cdf06c
fix: added missing release label
puffitos Jan 22, 2025
d1ca109
chore: rc9
puffitos Jan 22, 2025
817db7a
chore: rc0 for 1.0.0
puffitos Jan 23, 2025
3dcbe48
Merge branch 'chore/bump-68.1.1' into fix/rancher-performance
puffitos Jan 23, 2025
857659a
chore: rc1 for 1.0.0
puffitos Jan 23, 2025
d7900e9
chore: resolved merge conflicts
puffitos Jan 23, 2025
341bc84
chore: merged from main
puffitos Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Chart.yaml
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Loading