Skip to content

Commit 99dc673

Browse files
committed
Dashboard modifications
1 parent 8f85173 commit 99dc673

File tree

3 files changed

+143
-38
lines changed

3 files changed

+143
-38
lines changed

grafana/gitHub-dashboard.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@
443443
]
444444
},
445445
"time": {
446-
"from": "now-6h",
446+
"from": "now-24h",
447447
"to": "now"
448448
},
449449
"timepicker": {},

grafana/kubvizDsahboard.json

Lines changed: 129 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"editable": true,
2222
"fiscalYearStartMonth": 0,
2323
"graphTooltip": 0,
24-
"id": 5,
24+
"id": 76,
2525
"links": [],
2626
"liveNow": false,
2727
"panels": [
@@ -1503,24 +1503,27 @@
15031503
"type": "vertamedia-clickhouse-datasource",
15041504
"uid": "vertamedia-clickhouse-datasource"
15051505
},
1506-
"description": "This panel displays the total number of clusters containing activity uniquely.",
1506+
"description": "This panel displays the total number of clusters containing DeletedAPIs activity.",
15071507
"fieldConfig": {
15081508
"defaults": {
15091509
"color": {
15101510
"mode": "thresholds"
15111511
},
1512-
"links": [],
15131512
"mappings": [],
15141513
"thresholds": {
1515-
"mode": "percentage",
1514+
"mode": "absolute",
15161515
"steps": [
15171516
{
15181517
"color": "green",
15191518
"value": null
15201519
},
1520+
{
1521+
"color": "orange",
1522+
"value": 70
1523+
},
15211524
{
15221525
"color": "red",
1523-
"value": 80
1526+
"value": 85
15241527
}
15251528
]
15261529
}
@@ -1529,11 +1532,11 @@
15291532
},
15301533
"gridPos": {
15311534
"h": 5,
1532-
"w": 24,
1535+
"w": 8,
15331536
"x": 0,
15341537
"y": 32
15351538
},
1536-
"id": 40,
1539+
"id": 66,
15371540
"options": {
15381541
"orientation": "auto",
15391542
"reduceOptions": {
@@ -1563,24 +1566,61 @@
15631566
"refId": "A",
15641567
"round": "0s",
15651568
"skip_comments": true
1569+
}
1570+
],
1571+
"title": "Number of Clusters Containing DeletedAPIs Activity",
1572+
"type": "gauge"
1573+
},
1574+
{
1575+
"datasource": {
1576+
"type": "vertamedia-clickhouse-datasource",
1577+
"uid": "vertamedia-clickhouse-datasource"
1578+
},
1579+
"description": "This panel displays the total number of clusters containing Outdated Images activity.",
1580+
"fieldConfig": {
1581+
"defaults": {
1582+
"mappings": [],
1583+
"thresholds": {
1584+
"mode": "percentage",
1585+
"steps": [
1586+
{
1587+
"color": "green",
1588+
"value": null
1589+
},
1590+
{
1591+
"color": "orange",
1592+
"value": 70
1593+
},
1594+
{
1595+
"color": "red",
1596+
"value": 85
1597+
}
1598+
]
1599+
}
15661600
},
1567-
{
1568-
"datasource": {
1569-
"type": "vertamedia-clickhouse-datasource",
1570-
"uid": "vertamedia-clickhouse-datasource"
1571-
},
1572-
"dateTimeType": "DATETIME",
1573-
"extrapolate": true,
1574-
"format": "table",
1575-
"formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t",
1576-
"hide": false,
1577-
"intervalFactor": 1,
1578-
"query": "SELECT COUNT(DISTINCT ClusterName) AS DeprecatedAPIs\nFROM default.DeprecatedAPIs",
1579-
"rawQuery": "SELECT COUNT(DISTINCT ClusterName) AS DeprecatedAPIs\nFROM default.DeprecatedAPIs",
1580-
"refId": "B",
1581-
"round": "0s",
1582-
"skip_comments": true
1601+
"overrides": []
1602+
},
1603+
"gridPos": {
1604+
"h": 5,
1605+
"w": 8,
1606+
"x": 8,
1607+
"y": 32
1608+
},
1609+
"id": 68,
1610+
"options": {
1611+
"orientation": "auto",
1612+
"reduceOptions": {
1613+
"calcs": [
1614+
"lastNotNull"
1615+
],
1616+
"fields": "",
1617+
"values": false
15831618
},
1619+
"showThresholdLabels": false,
1620+
"showThresholdMarkers": true
1621+
},
1622+
"pluginVersion": "10.0.3",
1623+
"targets": [
15841624
{
15851625
"datasource": {
15861626
"type": "vertamedia-clickhouse-datasource",
@@ -1590,14 +1630,67 @@
15901630
"extrapolate": true,
15911631
"format": "table",
15921632
"formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t",
1593-
"hide": false,
15941633
"intervalFactor": 1,
1595-
"query": "SELECT count(DISTINCT(ClusterName)) AS Events\nFROM default.events",
1596-
"rawQuery": "SELECT count(DISTINCT(ClusterName)) AS Events\nFROM default.events",
1597-
"refId": "C",
1634+
"query": "SELECT count(DISTINCT(ClusterName)) AS OutdatedImages\nFROM default.outdated_images",
1635+
"rawQuery": "SELECT count(DISTINCT(ClusterName)) AS OutdatedImages\nFROM default.outdated_images",
1636+
"refId": "A",
15981637
"round": "0s",
15991638
"skip_comments": true
1639+
}
1640+
],
1641+
"title": "Number of Clusters Containing Outdated Images Activity",
1642+
"type": "gauge"
1643+
},
1644+
{
1645+
"datasource": {
1646+
"type": "vertamedia-clickhouse-datasource",
1647+
"uid": "vertamedia-clickhouse-datasource"
1648+
},
1649+
"description": "This panel displays the total number of clusters containing DeprecatedAPIs activity.",
1650+
"fieldConfig": {
1651+
"defaults": {
1652+
"mappings": [],
1653+
"thresholds": {
1654+
"mode": "percentage",
1655+
"steps": [
1656+
{
1657+
"color": "green",
1658+
"value": null
1659+
},
1660+
{
1661+
"color": "orange",
1662+
"value": 70
1663+
},
1664+
{
1665+
"color": "red",
1666+
"value": 85
1667+
}
1668+
]
1669+
}
16001670
},
1671+
"overrides": []
1672+
},
1673+
"gridPos": {
1674+
"h": 5,
1675+
"w": 8,
1676+
"x": 16,
1677+
"y": 32
1678+
},
1679+
"id": 67,
1680+
"options": {
1681+
"orientation": "auto",
1682+
"reduceOptions": {
1683+
"calcs": [
1684+
"lastNotNull"
1685+
],
1686+
"fields": "",
1687+
"values": false
1688+
},
1689+
"showThresholdLabels": false,
1690+
"showThresholdMarkers": true
1691+
},
1692+
"pluginVersion": "10.0.3",
1693+
"targets": [
16011694
{
16021695
"datasource": {
16031696
"type": "vertamedia-clickhouse-datasource",
@@ -1607,16 +1700,15 @@
16071700
"extrapolate": true,
16081701
"format": "table",
16091702
"formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t",
1610-
"hide": false,
16111703
"intervalFactor": 1,
1612-
"query": "SELECT count(DISTINCT(ClusterName)) AS OutdatedImages\nFROM default.outdated_images",
1613-
"rawQuery": "SELECT count(DISTINCT(ClusterName)) AS OutdatedImages\nFROM default.outdated_images",
1614-
"refId": "D",
1704+
"query": "SELECT COUNT(DISTINCT ClusterName) AS DeprecatedAPIs\nFROM default.DeprecatedAPIs",
1705+
"rawQuery": "SELECT COUNT(DISTINCT ClusterName) AS DeprecatedAPIs\nFROM default.DeprecatedAPIs",
1706+
"refId": "A",
16151707
"round": "0s",
16161708
"skip_comments": true
16171709
}
16181710
],
1619-
"title": "Number of Clusters Containing Activity",
1711+
"title": "Number of Clusters Containing DeprecatedAPIs Activity",
16201712
"type": "gauge"
16211713
},
16221714
{
@@ -2407,7 +2499,7 @@
24072499
"h": 16,
24082500
"w": 24,
24092501
"x": 0,
2410-
"y": 78
2502+
"y": 102
24112503
},
24122504
"id": 14,
24132505
"options": {
@@ -2510,7 +2602,7 @@
25102602
"h": 16,
25112603
"w": 24,
25122604
"x": 0,
2513-
"y": 226
2605+
"y": 250
25142606
},
25152607
"id": 10,
25162608
"options": {
@@ -2612,7 +2704,7 @@
26122704
"h": 11,
26132705
"w": 24,
26142706
"x": 0,
2615-
"y": 227
2707+
"y": 251
26162708
},
26172709
"id": 6,
26182710
"options": {
@@ -2714,7 +2806,7 @@
27142806
"h": 8,
27152807
"w": 24,
27162808
"x": 0,
2717-
"y": 228
2809+
"y": 252
27182810
},
27192811
"id": 2,
27202812
"options": {
@@ -2779,6 +2871,6 @@
27792871
"timezone": "",
27802872
"title": "Kubviz Dashboard",
27812873
"uid": "eT4fox94z",
2782-
"version": 1,
2874+
"version": 2,
27832875
"weekStart": ""
27842876
}

values.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
image:
2+
repository: ghcr.io/intelops/kubviz/client
3+
tag: "pr-237"
4+
5+
migration:
6+
image:
7+
repository: ghcr.io/intelops/kubviz/migration
8+
tag: "pr-237"
9+
10+
nats:
11+
auth:
12+
enabled: true
13+
token: "l8ZMOoWF2YZ7dlBtd92s28wQx4D7F35f"

0 commit comments

Comments
 (0)