Skip to content

Commit 7c2f806

Browse files
thegridmanthegridman
committed
COH-22859 Fix the Grafana Dashboard confusion
1 parent be4a52a commit 7c2f806

File tree

46 files changed

+1679
-1647
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1679
-1647
lines changed

‎Makefile‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ CREATE_OPERATOR_NAMESPACE ?= true
110110
PROMETHEUS_INCLUDE_GRAFANA ?= true
111111
PROMETHEUS_OPERATOR_VERSION ?= 8.13.7
112112
PROMETHEUS_ADAPTER_VERSION ?= 2.5.0
113-
GRAFANA_DASHBOARDS ?= dashboards/grafana-legacy/
113+
GRAFANA_DASHBOARDS ?= dashboards/grafana/
114114

115115
# Elasticsearch & Kibana settings (used in integration tests)
116116
ELASTIC_VERSION ?= 7.6.2
@@ -502,7 +502,7 @@ certification-test: install-certification
502502

503503

504504
# ----------------------------------------------------------------------------------------------------------------------
505-
# Install the Operator prior to running compatability tests.
505+
# Install the Operator prior to running compatibility tests.
506506
# ----------------------------------------------------------------------------------------------------------------------
507507
.PHONY: install-certification
508508
install-certification: $(BUILD_TARGETS)/build-operator reset-namespace create-ssl-secrets deploy
@@ -1258,6 +1258,7 @@ copyright:
12581258
-X build/_output/ \
12591259
-X clientset/ \
12601260
-X dashboards/grafana/ \
1261+
-X dashboards/grafana-microprofile/ \
12611262
-X dashboards/kibana/ \
12621263
-X /Dockerfile \
12631264
-X .Dockerfile \
@@ -1375,27 +1376,16 @@ release-dashboards:
13751376
tar -czvf $(BUILD_OUTPUT)/dashboards/$(VERSION)/coherence-dashboards.tar.gz dashboards/
13761377
kubectl create configmap coherence-grafana-dashboards --from-file=dashboards/grafana \
13771378
--dry-run -o yaml > $(BUILD_OUTPUT)/dashboards/$(VERSION)/coherence-grafana-dashboards.yaml
1378-
kubectl create configmap coherence-grafana-dashboards --from-file=dashboards/grafana-legacy \
1379-
--dry-run -o yaml > $(BUILD_OUTPUT)/dashboards/$(VERSION)/coherence-grafana-legacy-dashboards.yaml
1379+
kubectl create configmap coherence-grafana-dashboards --from-file=dashboards/grafana-microprofile \
1380+
--dry-run -o yaml > $(BUILD_OUTPUT)/dashboards/$(VERSION)/coherence-grafana-microprofile-dashboards.yaml
13801381
kubectl create configmap coherence-kibana-dashboards --from-file=dashboards/kibana \
13811382
--dry-run -o yaml > $(BUILD_OUTPUT)/dashboards/$(VERSION)/coherence-kibana-dashboards.yaml
1382-
mkdir -p dashboards || true
1383-
mv $(BUILD_OUTPUT)/dashboards/$(VERSION)/ dashboards/
13841383

13851384
# ----------------------------------------------------------------------------------------------------------------------
13861385
# Release the Coherence Operator to the gh-pages branch.
13871386
# ----------------------------------------------------------------------------------------------------------------------
13881387
.PHONY: release-ghpages
1389-
release-ghpages: helm-chart docs
1390-
@echo "Releasing Dashboards $(VERSION)"
1391-
mkdir -p $(BUILD_OUTPUT)/dashboards/$(VERSION) || true
1392-
tar -czvf $(BUILD_OUTPUT)/dashboards/$(VERSION)/coherence-dashboards.tar.gz dashboards/
1393-
kubectl create configmap coherence-grafana-dashboards --from-file=dashboards/grafana \
1394-
--dry-run -o yaml > $(BUILD_OUTPUT)/dashboards/$(VERSION)/coherence-grafana-dashboards.yaml
1395-
kubectl create configmap coherence-grafana-dashboards --from-file=dashboards/grafana-legacy \
1396-
--dry-run -o yaml > $(BUILD_OUTPUT)/dashboards/$(VERSION)/coherence-grafana-legacy-dashboards.yaml
1397-
kubectl create configmap coherence-kibana-dashboards --from-file=dashboards/kibana \
1398-
--dry-run -o yaml > $(BUILD_OUTPUT)/dashboards/$(VERSION)/coherence-kibana-dashboards.yaml
1388+
release-ghpages: helm-chart docs release-dashboards
13991389
git stash save --keep-index --include-untracked || true
14001390
git stash drop || true
14011391
git checkout --track origin/gh-pages
@@ -1421,9 +1411,16 @@ ifeq (true, $(PRE_RELEASE))
14211411
git add docs-unstable/*
14221412
git status
14231413
else
1414+
rm -rf dashboards/latest || true
1415+
cp -R dashboards/$(VERSION) dashboards/latest
1416+
git add -A dashboards/latest/*
14241417
mkdir docs/$(VERSION) || true
14251418
rm -rf docs/$(VERSION)/ || true
14261419
mv $(BUILD_OUTPUT)/docs/ docs/$(VERSION)/
1420+
rm -rf docs/latest
1421+
cp -R docs/$(VERSION) docs/latest
1422+
git add -A docs/*
1423+
14271424
ls -ls docs
14281425

14291426
mkdir -p charts || true
@@ -1433,12 +1430,11 @@ else
14331430
git add charts/index.yaml
14341431
ls -ls charts
14351432

1436-
git add docs/*
14371433
git status
14381434
endif
14391435
git clean -d -f
14401436
git status
1441-
git commit -m "adding Coherence Operator Helm chart and docs version: $(VERSION)"
1437+
git commit -A -m "Release Coherence Operator version: $(VERSION)"
14421438
git log -1
14431439
ifeq (true, $(RELEASE_DRY_RUN))
14441440
@echo "release dry-run - would have pushed Helm chart and docs $(VERSION) to gh-pages"

‎dashboards/grafana-legacy/alerts-dashboard.json‎ renamed to ‎dashboards/grafana-microprofile/alerts-dashboard.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
"steppedLine": false,
123123
"targets": [
124124
{
125-
"expr": "avg(delta(vendor:coherence_cluster_members_departure_count[5m]))",
125+
"expr": "avg(delta(vendor_Coherence_Cluster_MembersDepartureCount[5m]))",
126126
"format": "time_series",
127127
"interval": "",
128128
"intervalFactor": 1,
@@ -256,7 +256,7 @@
256256
"steppedLine": false,
257257
"targets": [
258258
{
259-
"expr": "avg(vendor:coherence_memory_heap_memory_usage_used / vendor:coherence_memory_heap_memory_usage_max) by(cluster) * 100",
259+
"expr": "avg(vendor_Coherence_Memory_HeapMemoryUsage_used / vendor_Coherence_Memory_HeapMemoryUsage_max) by(cluster) * 100",
260260
"format": "time_series",
261261
"interval": "",
262262
"intervalFactor": 1,
@@ -392,7 +392,7 @@
392392
"steppedLine": false,
393393
"targets": [
394394
{
395-
"expr": "avg(vendor:coherence_os_free_physical_memory_size / vendor:coherence_os_total_physical_memory_size) by (machine) * 100",
395+
"expr": "avg(vendor_Coherence_OS_FreePhysicalMemorySize / vendor_Coherence_OS_TotalPhysicalMemorySize) by (machine) * 100",
396396
"format": "time_series",
397397
"interval": "",
398398
"intervalFactor": 1,
@@ -529,7 +529,7 @@
529529
"steppedLine": false,
530530
"targets": [
531531
{
532-
"expr": "count(avg(vendor:coherence_service_partitions_unbalanced{type=~\"DistributedCache|FederatedCache\"}) by(name) > 0)",
532+
"expr": "count(avg(vendor_Coherence_Service_PartitionsUnbalanced{type=~\"DistributedCache|FederatedCache\"}) by(name) > 0)",
533533
"format": "time_series",
534534
"interval": "",
535535
"intervalFactor": 1,
@@ -667,7 +667,7 @@
667667
"steppedLine": false,
668668
"targets": [
669669
{
670-
"expr": "count(vendor:coherence_partition_assignment_ha_status_code <= 1)",
670+
"expr": "count(vendor_Coherence_PartitionAssignment_HAStatusCode <= 1)",
671671
"format": "time_series",
672672
"interval": "",
673673
"intervalFactor": 1,
@@ -804,7 +804,7 @@
804804
"steppedLine": false,
805805
"targets": [
806806
{
807-
"expr": "avg(delta(vendor:coherence_node_guard_recover_count[5m]))",
807+
"expr": "avg(delta(vendor_Coherence_Node_GuardRecoverCount[5m]))",
808808
"format": "time_series",
809809
"interval": "",
810810
"intervalFactor": 1,
@@ -941,7 +941,7 @@
941941
"steppedLine": false,
942942
"targets": [
943943
{
944-
"expr": "avg(delta(vendor:coherence_node_guard_terminate_count[5m]))",
944+
"expr": "avg(delta(vendor_Coherence_Node_GuardTerminateCount[5m]))",
945945
"format": "time_series",
946946
"interval": "",
947947
"intervalFactor": 1,
@@ -1078,7 +1078,7 @@
10781078
"steppedLine": false,
10791079
"targets": [
10801080
{
1081-
"expr": "count(vendor:coherence_cluster_size)",
1081+
"expr": "count(vendor_Coherence_Cluster_Size)",
10821082
"format": "time_series",
10831083
"intervalFactor": 1,
10841084
"legendFormat": "",
@@ -1215,7 +1215,7 @@
12151215
"steppedLine": false,
12161216
"targets": [
12171217
{
1218-
"expr": "avg(delta(vendor:coherence_federation_destination_status[5m]))",
1218+
"expr": "avg(delta(vendor_Coherence_Federation_DestinationStatus[5m]))",
12191219
"format": "time_series",
12201220
"interval": "",
12211221
"intervalFactor": 1,
@@ -1352,7 +1352,7 @@
13521352
"steppedLine": false,
13531353
"targets": [
13541354
{
1355-
"expr": "vendor:coherence_connection_manager_outgoing_byte_backlog",
1355+
"expr": "vendor_Coherence_ConnectionManager_OutgoingByteBacklog",
13561356
"format": "time_series",
13571357
"interval": "",
13581358
"intervalFactor": 1,

0 commit comments

Comments
 (0)