From 12f7e3aa3b0b9ed72b6d92c0c76517cacdbcd953 Mon Sep 17 00:00:00 2001 From: Robert Glonek Date: Fri, 30 Aug 2024 13:19:49 -0700 Subject: [PATCH 1/2] gcp do not require zone for expiry setting --- CHANGELOG/7.6.0.md | 1 + src/backendGcp.go | 13 +++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGELOG/7.6.0.md b/CHANGELOG/7.6.0.md index b7e4b2f4..653a3872 100644 --- a/CHANGELOG/7.6.0.md +++ b/CHANGELOG/7.6.0.md @@ -58,6 +58,7 @@ _Release Date: Month Day, Year_ * GCP: add option to specify minimum CPU platform during cluster and client creation. * GCP: expiry system updated to use `go122` runtime. * GCP: support using a single static key for all clusters and clients (must be located in `${AEROLAB_HOME}/sshkey(.pub)`; if it exists, will automatically be used). +* GCP: Do not require zone for instances when setting labels. * Inventory List: expose gcp/aws/docker tags/labels and metadata in json output. * Partitioner: when configuring index on device, parse partition tree sprig configs and fix if required. * Upgrade: added `aerolab upgrade --bugfix` - will upgrade to latest fix version, not bleeding edge version. diff --git a/src/backendGcp.go b/src/backendGcp.go index 83c39caf..e1a86e40 100644 --- a/src/backendGcp.go +++ b/src/backendGcp.go @@ -127,6 +127,7 @@ type gcpInstancePricing struct { type gcpClusterExpiryInstances struct { labelFingerprint string labels map[string]string + zone string } func (d *backendGcp) GetAZName(subnetId string) (string, error) { @@ -440,7 +441,7 @@ func (d *backendGcp) SetLabel(clusterName string, key string, value string, gcpZ } for _, jj := range j.Clusters { if jj.ClusterName == clusterName { - instances[jj.InstanceId] = gcpClusterExpiryInstances{jj.GcpMetadataFingerprint, jj.GcpMeta} + instances[jj.InstanceId] = gcpClusterExpiryInstances{jj.GcpMetadataFingerprint, jj.GcpMeta, jj.Zone} } } } else { @@ -451,7 +452,7 @@ func (d *backendGcp) SetLabel(clusterName string, key string, value string, gcpZ } for _, jj := range j.Clients { if jj.ClientName == clusterName { - instances[jj.InstanceId] = gcpClusterExpiryInstances{jj.GcpMetadataFingerprint, jj.GcpMeta} + instances[jj.InstanceId] = gcpClusterExpiryInstances{jj.GcpMetadataFingerprint, jj.GcpMeta, jj.Zone} } } } @@ -473,7 +474,7 @@ func (d *backendGcp) SetLabel(clusterName string, key string, value string, gcpZ _, err = instancesClient.SetMetadata(ctx, &computepb.SetMetadataInstanceRequest{ Instance: iName, Project: a.opts.Config.Backend.Project, - Zone: gcpZone, + Zone: iMeta.zone, MetadataResource: &computepb.Metadata{ Fingerprint: proto.String(iMeta.labelFingerprint), Items: items, @@ -497,7 +498,7 @@ func (d *backendGcp) ClusterExpiry(zone string, clusterName string, expiry time. for _, jj := range j.Clusters { nodeNo, _ := strconv.Atoi(jj.NodeNo) if jj.ClusterName == clusterName && (len(nodes) == 0 || inslice.HasInt(nodes, nodeNo)) { - instances[jj.InstanceId] = gcpClusterExpiryInstances{jj.GcpLabelFingerprint, jj.GcpLabels} + instances[jj.InstanceId] = gcpClusterExpiryInstances{jj.GcpLabelFingerprint, jj.GcpLabels, jj.Zone} } } } else { @@ -509,7 +510,7 @@ func (d *backendGcp) ClusterExpiry(zone string, clusterName string, expiry time. for _, jj := range j.Clients { nodeNo, _ := strconv.Atoi(jj.NodeNo) if jj.ClientName == clusterName && (len(nodes) == 0 || inslice.HasInt(nodes, nodeNo)) { - instances[jj.InstanceId] = gcpClusterExpiryInstances{jj.GcpLabelFingerprint, jj.GcpLabels} + instances[jj.InstanceId] = gcpClusterExpiryInstances{jj.GcpLabelFingerprint, jj.GcpLabels, jj.Zone} } } } @@ -532,7 +533,7 @@ func (d *backendGcp) ClusterExpiry(zone string, clusterName string, expiry time. newLabels["aerolab4expires"] = newExpiry _, err = instancesClient.SetLabels(ctx, &computepb.SetLabelsInstanceRequest{ Project: a.opts.Config.Backend.Project, - Zone: zone, + Zone: labelData.zone, Instance: instanceName, InstancesSetLabelsRequestResource: &computepb.InstancesSetLabelsRequest{ LabelFingerprint: proto.String(labelData.labelFingerprint), From 63add439b7f978984cc10d40ceb32c79b5c445ba Mon Sep 17 00:00:00 2001 From: Robert Glonek Date: Sat, 31 Aug 2024 11:49:04 -0700 Subject: [PATCH 2/2] AGI add v7.1 aerospike graphs --- .../libraryxX1-Library/general-stats.json | 13 +- .../namespace-transactions.json | 1120 ++++++++++++++++- .../libraryxX1-Library/namespace.json | 136 +- src/ingest/patterns.yml | 10 + 4 files changed, 1238 insertions(+), 41 deletions(-) diff --git a/src/grafanafix/dashboards/libraryxX1-Library/general-stats.json b/src/grafanafix/dashboards/libraryxX1-Library/general-stats.json index cb1d09eb..0a5af54c 100644 --- a/src/grafanafix/dashboards/libraryxX1-Library/general-stats.json +++ b/src/grafanafix/dashboards/libraryxX1-Library/general-stats.json @@ -466,6 +466,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "LaenKWPVz" + }, "options": { "legend": { "calcs": [], @@ -560,6 +563,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "0e74FWP4z" + }, "options": { "legend": { "calcs": [], @@ -950,9 +956,6 @@ }, "overrides": [] }, - "libraryPanel": { - "uid": "ov_IKWPVk" - }, "options": { "legend": { "calcs": [], @@ -972,7 +975,7 @@ "uid": "json" }, "editorMode": "code", - "payload": "{\n \"filterBy\":[{\n \"name\": \"NodeIdent\",\n \"mustExist\": true\n },\n {\n \"name\": \"ClusterName\",\n \"mustExist\": true\n }],\n \"timestampBinName\": \"timestamp\",\n \"groupBy\": [{\n \"name\": \"ClusterName\",\n \"required\": true\n },{\n \"name\": \"NodeIdent\",\n \"required\": true \n }],\n \"bins\": [{\n \"name\": \"configset\",\n \"displayName\": \"\",\n \"type\": \"number\",\n \"required\": true,\n \"singlarSeriesExtend\": \"$SingularSeriesExtend\",\n \"maxIntervalSeconds\": $MaxIntervalSeconds\n }]\n}\n", + "payload": "{\n \"filterBy\":[{\n \"name\": \"NodeIdent\",\n \"mustExist\": true\n },\n {\n \"name\": \"ClusterName\",\n \"mustExist\": true\n }],\n \"timestampBinName\": \"timestamp\",\n \"groupBy\": [{\n \"name\": \"ClusterName\",\n \"required\": true\n },{\n \"name\": \"NodeIdent\",\n \"required\": true \n },{\n \"name\": \"command\",\n \"required\": true \n }],\n \"bins\": [{\n \"name\": \"configset\",\n \"displayName\": \"\",\n \"type\": \"number\",\n \"required\": true,\n \"singlarSeriesExtend\": \"$SingularSeriesExtend\",\n \"maxIntervalSeconds\": $MaxIntervalSeconds\n }]\n}\n", "refId": "A", "target": "configset" } @@ -6912,7 +6915,7 @@ "type": "row" } ], - "refresh": false, + "refresh": "", "revision": 1, "schemaVersion": 38, "style": "dark", diff --git a/src/grafanafix/dashboards/libraryxX1-Library/namespace-transactions.json b/src/grafanafix/dashboards/libraryxX1-Library/namespace-transactions.json index a1d6fca8..d0e235d0 100644 --- a/src/grafanafix/dashboards/libraryxX1-Library/namespace-transactions.json +++ b/src/grafanafix/dashboards/libraryxX1-Library/namespace-transactions.json @@ -74,6 +74,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "xWAOioyVz" + }, "options": { "legend": { "calcs": [ @@ -169,6 +172,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "gZydiosVz" + }, "options": { "legend": { "calcs": [ @@ -264,6 +270,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "_56dmTs4z" + }, "options": { "legend": { "calcs": [ @@ -359,6 +368,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "RJDKiTy4z" + }, "options": { "legend": { "calcs": [ @@ -454,6 +466,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "YbTKmTsVz" + }, "options": { "legend": { "calcs": [ @@ -549,6 +564,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "C-CFmTs4k" + }, "options": { "legend": { "calcs": [ @@ -644,6 +662,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "7GM5mTsVz" + }, "options": { "legend": { "calcs": [ @@ -739,6 +760,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "UTFcmTsVz" + }, "options": { "legend": { "calcs": [ @@ -834,6 +858,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "pmf5mos4k" + }, "options": { "legend": { "calcs": [ @@ -929,6 +956,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "-R_5mTs4k" + }, "options": { "legend": { "calcs": [ @@ -1024,6 +1054,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "22Ipmoy4k" + }, "options": { "legend": { "calcs": [ @@ -1119,6 +1152,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "i_ppiosVz" + }, "options": { "legend": { "calcs": [ @@ -1214,6 +1250,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "7_Btios4k" + }, "options": { "legend": { "calcs": [ @@ -1309,6 +1348,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "q9Xtmos4k" + }, "options": { "legend": { "calcs": [ @@ -1404,6 +1446,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "TQW2mosVk" + }, "options": { "legend": { "calcs": [ @@ -1499,6 +1544,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "TbK2ioyVk" + }, "options": { "legend": { "calcs": [ @@ -1594,6 +1642,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "6TbhiTs4z" + }, "options": { "legend": { "calcs": [ @@ -1689,6 +1740,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "Oxl2mos4k" + }, "options": { "legend": { "calcs": [ @@ -1784,6 +1838,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "COiomTy4z" + }, "options": { "legend": { "calcs": [ @@ -1879,6 +1936,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "NwFTiTs4z" + }, "options": { "legend": { "calcs": [ @@ -1974,6 +2034,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "4f1omTy4k" + }, "options": { "legend": { "calcs": [ @@ -2069,6 +2132,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "968TmTy4z" + }, "options": { "legend": { "calcs": [ @@ -2164,6 +2230,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "ZvR0ioyVk" + }, "options": { "legend": { "calcs": [ @@ -2259,6 +2328,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "Ys40mTsVk" + }, "options": { "legend": { "calcs": [ @@ -2354,6 +2426,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "yL5Amos4k" + }, "options": { "legend": { "calcs": [ @@ -2449,6 +2524,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "kVY0iTyVk" + }, "options": { "legend": { "calcs": [ @@ -2544,6 +2622,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "WqXAios4z" + }, "options": { "legend": { "calcs": [ @@ -2639,6 +2720,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "d111ioyVk" + }, "options": { "legend": { "calcs": [ @@ -2733,6 +2817,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "hSq1mTy4k" + }, "options": { "legend": { "calcs": [ @@ -2827,6 +2914,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "CMVbiTsVz" + }, "options": { "legend": { "calcs": [ @@ -2921,6 +3011,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "xC5xmoy4z" + }, "options": { "legend": { "calcs": [ @@ -3015,6 +3108,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "NjbbiTs4z" + }, "options": { "legend": { "calcs": [ @@ -3109,6 +3205,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "R3uxmoy4k" + }, "options": { "legend": { "calcs": [ @@ -3203,6 +3302,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "fwG-moyVk" + }, "options": { "legend": { "calcs": [ @@ -3297,6 +3399,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "rrTamTy4z" + }, "options": { "legend": { "calcs": [ @@ -3391,6 +3496,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "D4E-mTs4k" + }, "options": { "legend": { "calcs": [ @@ -3485,6 +3593,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "GAC-ioyVz" + }, "options": { "legend": { "calcs": [ @@ -3579,6 +3690,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "j8MfiTs4z" + }, "options": { "legend": { "calcs": [ @@ -3673,6 +3787,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "545fios4z" + }, "options": { "legend": { "calcs": [ @@ -3767,6 +3884,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "bTaBmoy4k" + }, "options": { "legend": { "calcs": [ @@ -3861,6 +3981,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "YJuBmTsVz" + }, "options": { "legend": { "calcs": [ @@ -3955,6 +4078,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "2ekYmosVz" + }, "options": { "legend": { "calcs": [ @@ -4049,6 +4175,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "GHDLmTy4z" + }, "options": { "legend": { "calcs": [ @@ -4143,6 +4272,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "N0wYmos4z" + }, "options": { "legend": { "calcs": [ @@ -4237,6 +4369,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "4GzPmTsVk" + }, "options": { "legend": { "calcs": [ @@ -4331,6 +4466,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "NJNEiTy4k" + }, "options": { "legend": { "calcs": [ @@ -4425,6 +4563,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "rG0EioyVz" + }, "options": { "legend": { "calcs": [ @@ -4519,6 +4660,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "aNPPiTsVz" + }, "options": { "legend": { "calcs": [ @@ -4613,6 +4757,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "KsqPmoy4k" + }, "options": { "legend": { "calcs": [ @@ -4707,6 +4854,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "KFnyiTyVz" + }, "options": { "legend": { "calcs": [ @@ -4801,6 +4951,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "NktymTyVk" + }, "options": { "legend": { "calcs": [ @@ -4895,6 +5048,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "LYqUmTy4z" + }, "options": { "legend": { "calcs": [ @@ -4990,6 +5146,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "TSnQmos4z" + }, "options": { "legend": { "calcs": [ @@ -5085,6 +5244,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "YUJQiTy4z" + }, "options": { "legend": { "calcs": [ @@ -5180,6 +5342,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "1YwwmTy4k" + }, "options": { "legend": { "calcs": [ @@ -5275,6 +5440,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "bgRliTyVz" + }, "options": { "legend": { "calcs": [ @@ -5370,6 +5538,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "A2H_mos4z" + }, "options": { "legend": { "calcs": [ @@ -5465,6 +5636,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "ybJliTsVz" + }, "options": { "legend": { "calcs": [ @@ -5560,6 +5734,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "0NllmTsVz" + }, "options": { "legend": { "calcs": [ @@ -5655,6 +5832,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "edNumosVz" + }, "options": { "legend": { "calcs": [ @@ -5750,6 +5930,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "7IJuiosVz" + }, "options": { "legend": { "calcs": [ @@ -5845,6 +6028,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "BvyXiTy4k" + }, "options": { "legend": { "calcs": [ @@ -5940,6 +6126,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "uLqumosVk" + }, "options": { "legend": { "calcs": [ @@ -6035,6 +6224,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "t2n9iTs4z" + }, "options": { "legend": { "calcs": [ @@ -6130,6 +6322,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "GJFrioyVk" + }, "options": { "legend": { "calcs": [ @@ -6225,6 +6420,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "YSx9mTy4z" + }, "options": { "legend": { "calcs": [ @@ -6320,6 +6518,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "oy76mTs4k" + }, "options": { "legend": { "calcs": [ @@ -6415,6 +6616,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "yHt6moyVk" + }, "options": { "legend": { "calcs": [ @@ -6510,6 +6714,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "fraeiTy4k" + }, "options": { "legend": { "calcs": [ @@ -6605,6 +6812,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "p-CeiTyVk" + }, "options": { "legend": { "calcs": [ @@ -6700,6 +6910,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "7wZgZTsVz" + }, "options": { "legend": { "calcs": [ @@ -6795,6 +7008,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "bjDRWos4k" + }, "options": { "legend": { "calcs": [ @@ -6890,6 +7106,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "eNURZoyVz" + }, "options": { "legend": { "calcs": [ @@ -6985,6 +7204,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "DTqgZTy4z" + }, "options": { "legend": { "calcs": [ @@ -7080,6 +7302,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "LnVzZTy4k" + }, "options": { "legend": { "calcs": [ @@ -7175,6 +7400,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "1dtkWTyVz" + }, "options": { "legend": { "calcs": [ @@ -7270,6 +7498,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "ZyxkZoy4k" + }, "options": { "legend": { "calcs": [ @@ -7365,6 +7596,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "ar8kWTyVz" + }, "options": { "legend": { "calcs": [ @@ -7460,6 +7694,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "DwgmZTy4z" + }, "options": { "legend": { "calcs": [ @@ -7555,6 +7792,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "QLNmWosVk" + }, "options": { "legend": { "calcs": [ @@ -7650,6 +7890,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "bZTmWoyVk" + }, "options": { "legend": { "calcs": [ @@ -7745,6 +7988,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "Nq3iZTyVz" + }, "options": { "legend": { "calcs": [ @@ -7840,6 +8086,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "eXnZZoyVk" + }, "options": { "legend": { "calcs": [ @@ -7935,6 +8184,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "5scWWoyVz" + }, "options": { "legend": { "calcs": [ @@ -8030,6 +8282,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "dmaWZTs4z" + }, "options": { "legend": { "calcs": [ @@ -8125,6 +8380,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "QG_WZoy4z" + }, "options": { "legend": { "calcs": [ @@ -8220,6 +8478,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "LfRMWTyVk" + }, "options": { "legend": { "calcs": [ @@ -8315,6 +8576,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "R6dGWosVz" + }, "options": { "legend": { "calcs": [ @@ -8410,6 +8674,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "m_1MWos4z" + }, "options": { "legend": { "calcs": [ @@ -8505,6 +8772,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "8WUGZTyVz" + }, "options": { "legend": { "calcs": [ @@ -8600,6 +8870,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "nRk7Woy4k" + }, "options": { "legend": { "calcs": [ @@ -8695,6 +8968,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "jnTnZos4z" + }, "options": { "legend": { "calcs": [ @@ -8790,6 +9066,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "IrBnZTy4z" + }, "options": { "legend": { "calcs": [ @@ -8885,6 +9164,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "jlq7WoyVz" + }, "options": { "legend": { "calcs": [ @@ -8980,6 +9262,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "lAVVWTyVz" + }, "options": { "legend": { "calcs": [ @@ -9075,6 +9360,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "kKc4WoyVk" + }, "options": { "legend": { "calcs": [ @@ -9170,6 +9458,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "3taVWTsVk" + }, "options": { "legend": { "calcs": [ @@ -9265,6 +9556,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "VCCFWTy4k" + }, "options": { "legend": { "calcs": [ @@ -9360,6 +9654,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "43McZosVk" + }, "options": { "legend": { "calcs": [ @@ -9455,6 +9752,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "9eFcZos4z" + }, "options": { "legend": { "calcs": [ @@ -9550,6 +9850,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "znB5ZTy4k" + }, "options": { "legend": { "calcs": [ @@ -9645,6 +9948,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "gk_5ZTy4k" + }, "options": { "legend": { "calcs": [ @@ -9740,6 +10046,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "6JZtWTyVz" + }, "options": { "legend": { "calcs": [ @@ -9835,6 +10144,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "--DpWTy4k" + }, "options": { "legend": { "calcs": [ @@ -9930,6 +10242,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "Ef1pWosVk" + }, "options": { "legend": { "calcs": [ @@ -10025,6 +10340,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "lCUpZTy4k" + }, "options": { "legend": { "calcs": [ @@ -10120,6 +10438,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "TWR2Zoy4k" + }, "options": { "legend": { "calcs": [ @@ -10215,6 +10536,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "4Jp2ZosVz" + }, "options": { "legend": { "calcs": [ @@ -10310,6 +10634,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "kZa2ZTy4k" + }, "options": { "legend": { "calcs": [ @@ -10405,6 +10732,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "_PQhZTsVz" + }, "options": { "legend": { "calcs": [ @@ -10500,6 +10830,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "tLRTWTy4z" + }, "options": { "legend": { "calcs": [ @@ -10595,6 +10928,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "CBVTZTsVz" + }, "options": { "legend": { "calcs": [ @@ -10690,6 +11026,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "H5oTWos4k" + }, "options": { "legend": { "calcs": [ @@ -10785,6 +11124,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "3sLTWoyVk" + }, "options": { "legend": { "calcs": [ @@ -10880,6 +11222,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "6VjoZTyVk" + }, "options": { "legend": { "calcs": [ @@ -10975,6 +11320,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "YcGAZosVk" + }, "options": { "legend": { "calcs": [ @@ -11070,6 +11418,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "g-sAWTy4z" + }, "options": { "legend": { "calcs": [ @@ -11165,6 +11516,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "cAe0ZTs4z" + }, "options": { "legend": { "calcs": [ @@ -11260,6 +11614,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "d24JZTsVz" + }, "options": { "legend": { "calcs": [ @@ -11355,6 +11712,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "r7p1WoyVk" + }, "options": { "legend": { "calcs": [ @@ -11450,6 +11810,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "ICB1WTyVz" + }, "options": { "legend": { "calcs": [ @@ -11545,6 +11908,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "0jrJWoyVk" + }, "options": { "legend": { "calcs": [ @@ -11640,6 +12006,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "tPZbWTs4k" + }, "options": { "legend": { "calcs": [ @@ -11735,6 +12104,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "nFdxWoy4z" + }, "options": { "legend": { "calcs": [ @@ -11830,6 +12202,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "WmlaWoy4z" + }, "options": { "legend": { "calcs": [ @@ -11924,6 +12299,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "5j6-WTs4z" + }, "options": { "legend": { "calcs": [ @@ -12018,6 +12396,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "HISfZosVk" + }, "options": { "legend": { "calcs": [ @@ -12112,6 +12493,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "iqpBWosVk" + }, "options": { "legend": { "calcs": [ @@ -12206,6 +12590,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "wEaBZTy4k" + }, "options": { "legend": { "calcs": [ @@ -12300,6 +12687,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "xNlBZoy4z" + }, "options": { "legend": { "calcs": [ @@ -12394,6 +12784,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "g3zLZTs4k" + }, "options": { "legend": { "calcs": [ @@ -12488,6 +12881,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "KVdLZoy4k" + }, "options": { "legend": { "calcs": [ @@ -12582,6 +12978,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "GwAYZos4z" + }, "options": { "legend": { "calcs": [ @@ -12676,6 +13075,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "M-rYZTyVz" + }, "options": { "legend": { "calcs": [ @@ -12770,6 +13172,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "CUiPZTyVk" + }, "options": { "legend": { "calcs": [ @@ -12864,6 +13269,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "flOEZoyVk" + }, "options": { "legend": { "calcs": [ @@ -12958,6 +13366,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "JGJPWosVk" + }, "options": { "legend": { "calcs": [ @@ -13052,6 +13463,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "1psPZTsVz" + }, "options": { "legend": { "calcs": [ @@ -13146,6 +13560,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "MB3PWTsVz" + }, "options": { "legend": { "calcs": [ @@ -13240,6 +13657,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "4ybyWTs4z" + }, "options": { "legend": { "calcs": [ @@ -13334,6 +13754,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "QnQsWosVk" + }, "options": { "legend": { "calcs": [ @@ -13428,6 +13851,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "qeeyZos4z" + }, "options": { "legend": { "calcs": [ @@ -13522,6 +13948,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "1eV8WosVk" + }, "options": { "legend": { "calcs": [ @@ -13616,6 +14045,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "1Ft8ZTs4z" + }, "options": { "legend": { "calcs": [ @@ -13710,6 +14142,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "1VL8Wos4k" + }, "options": { "legend": { "calcs": [ @@ -13804,6 +14239,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "EEr8Zos4k" + }, "options": { "legend": { "calcs": [ @@ -13898,6 +14336,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "glmwZTs4z" + }, "options": { "legend": { "calcs": [ @@ -13992,6 +14433,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "Q9vQWosVz" + }, "options": { "legend": { "calcs": [ @@ -14086,6 +14530,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "pzhIZTsVk" + }, "options": { "legend": { "calcs": [ @@ -14181,6 +14628,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "Gt-SZTs4k" + }, "options": { "legend": { "calcs": [ @@ -14276,6 +14726,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "_0rSZoyVk" + }, "options": { "legend": { "calcs": [ @@ -14371,6 +14824,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "M6mNZoyVk" + }, "options": { "legend": { "calcs": [ @@ -14466,6 +14922,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "o1DHZosVz" + }, "options": { "legend": { "calcs": [ @@ -14561,6 +15020,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "_tANZTy4z" + }, "options": { "legend": { "calcs": [ @@ -14656,6 +15118,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "ZeUNZoyVz" + }, "options": { "legend": { "calcs": [ @@ -14751,6 +15216,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "_onvWTsVk" + }, "options": { "legend": { "calcs": [ @@ -14846,6 +15314,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "H0cvZosVk" + }, "options": { "legend": { "calcs": [ @@ -14941,6 +15412,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "cnfvWoyVz" + }, "options": { "legend": { "calcs": [ @@ -15036,6 +15510,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "OylDWTs4z" + }, "options": { "legend": { "calcs": [ @@ -15131,6 +15608,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "aSkdWoyVz" + }, "options": { "legend": { "calcs": [ @@ -15226,6 +15706,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "XQNOWTy4z" + }, "options": { "legend": { "calcs": [ @@ -15321,6 +15804,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "as-OZTy4z" + }, "options": { "legend": { "calcs": [ @@ -15371,6 +15857,12 @@ "id": "text", "name": "Text", "version": "" + }, + { + "type": "panel", + "id": "timeseries", + "name": "Time series", + "version": "" } ], "annotations": { @@ -15649,7 +16141,7 @@ "h": 7, "w": 8, "x": 0, - "y": 5 + "y": 13 }, "id": 110, "libraryPanel": { @@ -15663,7 +16155,7 @@ "h": 7, "w": 8, "x": 8, - "y": 5 + "y": 13 }, "id": 111, "libraryPanel": { @@ -15677,7 +16169,7 @@ "h": 7, "w": 8, "x": 16, - "y": 5 + "y": 13 }, "id": 112, "libraryPanel": { @@ -15691,7 +16183,7 @@ "h": 7, "w": 8, "x": 0, - "y": 12 + "y": 20 }, "id": 108, "libraryPanel": { @@ -15705,7 +16197,7 @@ "h": 7, "w": 8, "x": 8, - "y": 12 + "y": 20 }, "id": 109, "libraryPanel": { @@ -16874,6 +17366,602 @@ "x": 0, "y": 11 }, + "id": 212, + "panels": [ + { + "datasource": { + "type": "simpod-json-datasource", + "uid": "${DS_JSON}" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "short" + }, + "overrides": [] + }, + "gridPos": { + "h": 7, + "w": 8, + "x": 0, + "y": 5 + }, + "id": 213, + "options": { + "legend": { + "calcs": [ + "max", + "min" + ], + "displayMode": "table", + "placement": "right", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "desc" + } + }, + "targets": [ + { + "datasource": { + "type": "simpod-json-datasource", + "uid": "${DS_JSON}" + }, + "editorMode": "code", + "payload": "{\n \"filterBy\":[{\n \"name\": \"NodeIdent\",\n \"mustExist\": true\n },\n {\n \"name\": \"ClusterName\",\n \"mustExist\": true\n },\n {\n \"name\": \"Namespace\",\n \"mustExist\": false\n }],\n \"timestampBinName\": \"timestamp\",\n \"groupBy\": [{\n \"name\": \"ClusterName\",\n \"required\": true\n },{\n \"name\": \"NodeIdent\",\n \"required\": true \n },\n {\n \"name\": \"Namespace\",\n \"mustExist\": false\n }],\n \"bins\": [{\n \"name\": \"touchTsvcErr\",\n \"displayName\": \"\",\n \"type\": \"number\",\n \"required\": true,\n \"singlarSeriesExtend\": \"$SingularSeriesExtend\",\n \"maxIntervalSeconds\": $MaxIntervalSeconds,\n \"produceDelta\": $ProduceDelta,\n \"convertToPerSecond\": $ProduceDelta,\n \"limits\": {\n \"minValue\": 0,\n \"replaceWithOriginal\": true\n }\n }]\n}\n", + "refId": "A", + "target": "nsTouch" + } + ], + "title": "read-touch/sec: tsvc Error", + "type": "timeseries" + }, + { + "datasource": { + "type": "simpod-json-datasource", + "uid": "${DS_JSON}" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "short" + }, + "overrides": [] + }, + "gridPos": { + "h": 7, + "w": 8, + "x": 8, + "y": 5 + }, + "id": 214, + "options": { + "legend": { + "calcs": [ + "max", + "min" + ], + "displayMode": "table", + "placement": "right", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "desc" + } + }, + "targets": [ + { + "datasource": { + "type": "simpod-json-datasource", + "uid": "${DS_JSON}" + }, + "editorMode": "code", + "payload": "{\n \"filterBy\":[{\n \"name\": \"NodeIdent\",\n \"mustExist\": true\n },\n {\n \"name\": \"ClusterName\",\n \"mustExist\": true\n },\n {\n \"name\": \"Namespace\",\n \"mustExist\": false\n }],\n \"timestampBinName\": \"timestamp\",\n \"groupBy\": [{\n \"name\": \"ClusterName\",\n \"required\": true\n },{\n \"name\": \"NodeIdent\",\n \"required\": true \n },\n {\n \"name\": \"Namespace\",\n \"mustExist\": false\n }],\n \"bins\": [{\n \"name\": \"touchTsvcTout\",\n \"displayName\": \"\",\n \"type\": \"number\",\n \"required\": true,\n \"singlarSeriesExtend\": \"$SingularSeriesExtend\",\n \"maxIntervalSeconds\": $MaxIntervalSeconds,\n \"produceDelta\": $ProduceDelta,\n \"convertToPerSecond\": $ProduceDelta,\n \"limits\": {\n \"minValue\": 0,\n \"replaceWithOriginal\": true\n }\n }]\n}\n", + "refId": "A", + "target": "nsTouch" + } + ], + "title": "read-touch/sec: tsvc Timeout", + "type": "timeseries" + }, + { + "datasource": { + "type": "simpod-json-datasource", + "uid": "${DS_JSON}" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "short" + }, + "overrides": [] + }, + "gridPos": { + "h": 7, + "w": 8, + "x": 16, + "y": 5 + }, + "id": 215, + "options": { + "legend": { + "calcs": [ + "max", + "min" + ], + "displayMode": "table", + "placement": "right", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "desc" + } + }, + "targets": [ + { + "datasource": { + "type": "simpod-json-datasource", + "uid": "${DS_JSON}" + }, + "editorMode": "code", + "payload": "{\n \"filterBy\":[{\n \"name\": \"NodeIdent\",\n \"mustExist\": true\n },\n {\n \"name\": \"ClusterName\",\n \"mustExist\": true\n },\n {\n \"name\": \"Namespace\",\n \"mustExist\": false\n }],\n \"timestampBinName\": \"timestamp\",\n \"groupBy\": [{\n \"name\": \"ClusterName\",\n \"required\": true\n },{\n \"name\": \"NodeIdent\",\n \"required\": true \n },\n {\n \"name\": \"Namespace\",\n \"mustExist\": false\n }],\n \"bins\": [{\n \"name\": \"touchOk\",\n \"displayName\": \"\",\n \"type\": \"number\",\n \"required\": true,\n \"singlarSeriesExtend\": \"$SingularSeriesExtend\",\n \"maxIntervalSeconds\": $MaxIntervalSeconds,\n \"produceDelta\": $ProduceDelta,\n \"convertToPerSecond\": $ProduceDelta,\n \"limits\": {\n \"minValue\": 0,\n \"replaceWithOriginal\": true\n }\n }]\n}\n", + "refId": "A", + "target": "nsTouch" + } + ], + "title": "read-touch/sec: all-triggers Success", + "type": "timeseries" + }, + { + "datasource": { + "type": "simpod-json-datasource", + "uid": "${DS_JSON}" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "short" + }, + "overrides": [] + }, + "gridPos": { + "h": 7, + "w": 8, + "x": 0, + "y": 12 + }, + "id": 216, + "options": { + "legend": { + "calcs": [ + "max", + "min" + ], + "displayMode": "table", + "placement": "right", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "desc" + } + }, + "targets": [ + { + "datasource": { + "type": "simpod-json-datasource", + "uid": "${DS_JSON}" + }, + "editorMode": "code", + "payload": "{\n \"filterBy\":[{\n \"name\": \"NodeIdent\",\n \"mustExist\": true\n },\n {\n \"name\": \"ClusterName\",\n \"mustExist\": true\n },\n {\n \"name\": \"Namespace\",\n \"mustExist\": false\n }],\n \"timestampBinName\": \"timestamp\",\n \"groupBy\": [{\n \"name\": \"ClusterName\",\n \"required\": true\n },{\n \"name\": \"NodeIdent\",\n \"required\": true \n },\n {\n \"name\": \"Namespace\",\n \"mustExist\": false\n }],\n \"bins\": [{\n \"name\": \"touchErr\",\n \"displayName\": \"\",\n \"type\": \"number\",\n \"required\": true,\n \"singlarSeriesExtend\": \"$SingularSeriesExtend\",\n \"maxIntervalSeconds\": $MaxIntervalSeconds,\n \"produceDelta\": $ProduceDelta,\n \"convertToPerSecond\": $ProduceDelta,\n \"limits\": {\n \"minValue\": 0,\n \"replaceWithOriginal\": true\n }\n }]\n}\n", + "refId": "A", + "target": "nsTouch" + } + ], + "title": "read-touch/sec: all-triggers Error", + "type": "timeseries" + }, + { + "datasource": { + "type": "simpod-json-datasource", + "uid": "${DS_JSON}" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "short" + }, + "overrides": [] + }, + "gridPos": { + "h": 7, + "w": 8, + "x": 8, + "y": 12 + }, + "id": 217, + "options": { + "legend": { + "calcs": [ + "max", + "min" + ], + "displayMode": "table", + "placement": "right", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "desc" + } + }, + "targets": [ + { + "datasource": { + "type": "simpod-json-datasource", + "uid": "${DS_JSON}" + }, + "editorMode": "code", + "payload": "{\n \"filterBy\":[{\n \"name\": \"NodeIdent\",\n \"mustExist\": true\n },\n {\n \"name\": \"ClusterName\",\n \"mustExist\": true\n },\n {\n \"name\": \"Namespace\",\n \"mustExist\": false\n }],\n \"timestampBinName\": \"timestamp\",\n \"groupBy\": [{\n \"name\": \"ClusterName\",\n \"required\": true\n },{\n \"name\": \"NodeIdent\",\n \"required\": true \n },\n {\n \"name\": \"Namespace\",\n \"mustExist\": false\n }],\n \"bins\": [{\n \"name\": \"touchTout\",\n \"displayName\": \"\",\n \"type\": \"number\",\n \"required\": true,\n \"singlarSeriesExtend\": \"$SingularSeriesExtend\",\n \"maxIntervalSeconds\": $MaxIntervalSeconds,\n \"produceDelta\": $ProduceDelta,\n \"convertToPerSecond\": $ProduceDelta,\n \"limits\": {\n \"minValue\": 0,\n \"replaceWithOriginal\": true\n }\n }]\n}\n", + "refId": "A", + "target": "nsTouch" + } + ], + "title": "read-touch/sec: all-triggers Timeout", + "type": "timeseries" + }, + { + "datasource": { + "type": "simpod-json-datasource", + "uid": "${DS_JSON}" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "short" + }, + "overrides": [] + }, + "gridPos": { + "h": 7, + "w": 8, + "x": 16, + "y": 12 + }, + "id": 218, + "options": { + "legend": { + "calcs": [ + "max", + "min" + ], + "displayMode": "table", + "placement": "right", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "desc" + } + }, + "targets": [ + { + "datasource": { + "type": "simpod-json-datasource", + "uid": "${DS_JSON}" + }, + "editorMode": "code", + "payload": "{\n \"filterBy\":[{\n \"name\": \"NodeIdent\",\n \"mustExist\": true\n },\n {\n \"name\": \"ClusterName\",\n \"mustExist\": true\n },\n {\n \"name\": \"Namespace\",\n \"mustExist\": false\n }],\n \"timestampBinName\": \"timestamp\",\n \"groupBy\": [{\n \"name\": \"ClusterName\",\n \"required\": true\n },{\n \"name\": \"NodeIdent\",\n \"required\": true \n },\n {\n \"name\": \"Namespace\",\n \"mustExist\": false\n }],\n \"bins\": [{\n \"name\": \"touchSkip\",\n \"displayName\": \"\",\n \"type\": \"number\",\n \"required\": true,\n \"singlarSeriesExtend\": \"$SingularSeriesExtend\",\n \"maxIntervalSeconds\": $MaxIntervalSeconds,\n \"produceDelta\": $ProduceDelta,\n \"convertToPerSecond\": $ProduceDelta,\n \"limits\": {\n \"minValue\": 0,\n \"replaceWithOriginal\": true\n }\n }]\n}\n", + "refId": "A", + "target": "nsTouch" + } + ], + "title": "read-touch/sec: all-triggers Skip", + "type": "timeseries" + } + ], + "title": "Read-Touch (v7.1+)", + "type": "row" + }, + { + "collapsed": true, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 12 + }, "id": 97, "panels": [ { @@ -17026,7 +18114,7 @@ "h": 1, "w": 24, "x": 0, - "y": 12 + "y": 13 }, "id": 99, "panels": [ @@ -17124,7 +18212,7 @@ "h": 1, "w": 24, "x": 0, - "y": 13 + "y": 14 }, "id": 101, "panels": [ @@ -17208,7 +18296,7 @@ "h": 1, "w": 24, "x": 0, - "y": 14 + "y": 15 }, "id": 103, "panels": [ @@ -17292,7 +18380,7 @@ "h": 1, "w": 24, "x": 0, - "y": 15 + "y": 16 }, "id": 105, "panels": [ @@ -17432,7 +18520,7 @@ "h": 1, "w": 24, "x": 0, - "y": 16 + "y": 17 }, "id": 107, "panels": [ @@ -17558,7 +18646,7 @@ "h": 1, "w": 24, "x": 0, - "y": 17 + "y": 18 }, "id": 37, "panels": [ @@ -17908,7 +18996,7 @@ "h": 1, "w": 24, "x": 0, - "y": 18 + "y": 19 }, "id": 63, "panels": [ @@ -18020,7 +19108,7 @@ "h": 1, "w": 24, "x": 0, - "y": 19 + "y": 20 }, "id": 65, "panels": [ @@ -18127,7 +19215,7 @@ "type": "row" } ], - "refresh": false, + "refresh": "", "revision": 1, "schemaVersion": 38, "style": "dark", @@ -18612,6 +19700,6 @@ "timezone": "", "title": "Namespace Transactions", "uid": "nstransact", - "version": 7, + "version": 2, "weekStart": "" -} +} \ No newline at end of file diff --git a/src/grafanafix/dashboards/libraryxX1-Library/namespace.json b/src/grafanafix/dashboards/libraryxX1-Library/namespace.json index 3da0a4e2..7015d6bf 100644 --- a/src/grafanafix/dashboards/libraryxX1-Library/namespace.json +++ b/src/grafanafix/dashboards/libraryxX1-Library/namespace.json @@ -11575,6 +11575,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "Zij1iKE4z" + }, "options": { "legend": { "calcs": [ @@ -12072,6 +12075,9 @@ }, "overrides": [] }, + "libraryPanel": { + "uid": "N0AomKP4z" + }, "options": { "legend": { "calcs": [ @@ -14215,6 +14221,105 @@ "uid": "edcca7d6-e5ef-4fe6-8b50-bfcc6b0cebe9" }, "title": "eviction - sindex-memory" + }, + { + "datasource": { + "type": "simpod-json-datasource", + "uid": "${DS_JSON}" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineStyle": { + "fill": "solid" + }, + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "bytes" + }, + "overrides": [] + }, + "gridPos": { + "h": 7, + "w": 8, + "x": 16, + "y": 25 + }, + "id": 197, + "options": { + "legend": { + "calcs": [ + "max" + ], + "displayMode": "table", + "placement": "right", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "desc" + } + }, + "targets": [ + { + "datasource": { + "type": "simpod-json-datasource", + "uid": "${DS_JSON}" + }, + "editorMode": "code", + "payload": "{\n \"filterBy\":[{\n \"name\": \"NodeIdent\",\n \"mustExist\": true\n },\n {\n \"name\": \"ClusterName\",\n \"mustExist\": true\n },\n {\n \"name\": \"Namespace\",\n \"mustExist\": false\n }],\n \"timestampBinName\": \"timestamp\",\n \"groupBy\": [{\n \"name\": \"ClusterName\",\n \"required\": true\n },{\n \"name\": \"NodeIdent\",\n \"required\": true \n },\n {\n \"name\": \"Namespace\",\n \"mustExist\": false\n },\n {\n \"name\": \"evictReason\",\n \"mustExist\": true\n }],\n \"bins\": [{\n \"name\": \"evictMIdxUsePct\",\n \"displayName\": \"\",\n \"type\": \"number\",\n \"required\": true,\n \"singlarSeriesExtend\": \"$SingularSeriesExtend\",\n \"maxIntervalSeconds\": $MaxIntervalSeconds\n }]\n}\n", + "refId": "A", + "target": "nsEvict" + } + ], + "title": "eviction - index-memory used-pct", + "type": "timeseries" } ], "title": "Eviction Breaches (asd v7+)", @@ -15526,8 +15631,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -15681,8 +15785,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -15780,8 +15883,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -15879,8 +15981,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -15978,8 +16079,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -16077,8 +16177,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -16176,8 +16275,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -16275,8 +16373,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -16374,8 +16471,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -17118,7 +17214,7 @@ "type": "row" } ], - "refresh": false, + "refresh": "", "revision": 1, "schemaVersion": 38, "style": "dark", @@ -17609,4 +17705,4 @@ "uid": "zgXTPgPVka", "version": 2, "weekStart": "" -} +} \ No newline at end of file diff --git a/src/ingest/patterns.yml b/src/ingest/patterns.yml index d440a40e..eaf681ad 100644 --- a/src/ingest/patterns.yml +++ b/src/ingest/patterns.yml @@ -236,6 +236,9 @@ defs: setName: "nsEvict" #v7 search: "breached eviction limit" export: + - "{(?P[^}]+)} breached eviction limit \\((?P[^)]+)\\), sys-memory pct:(?P\\d+), indexes-memory sz:(?P\\d+) \\((?P\\d+) + (?P\\d+) + (?P\\d+)\\) used-pct:(?P\\d+), data used-pct:(?P\\d+)" + - "{(?P[^}]+)} breached eviction limit \\((?P[^)]+)\\), sys-memory pct:(?P\\d+), indexes-memory sz:(?P\\d+) \\((?P\\d+) + (?P\\d+) + (?P\\d+)\\) used-pct:(?P\\d+), index-device sz:(?P\\d+) used-pct (?P\\d+), data used-pct:(?P\\d+)" + - "{(?P[^}]+)} breached eviction limit \\((?P[^)]+)\\), sys-memory pct:(?P\\d+), indexes-memory sz:(?P\\d+) \\((?P\\d+) + (?P\\d+) + (?P\\d+)\\), data used-pct:(?P\\d+)" - "{(?P[^}]+)} breached eviction limit \\((?P[^)]+)\\), sys-memory pct:(?P\\d+), indexes-memory sz:(?P\\d+) \\((?P\\d+) + (?P\\d+) + (?P\\d+)\\), index-device sz:(?P\\d+) used-pct (?P\\d+), data used-pct:(?P\\d+)" - setName: "nsMemory" @@ -316,6 +319,8 @@ defs: - "(?P\\d+) build (?P[^ ]+)" - setName: "configset" + labels: + - "command" search: "config-set" replace: - @@ -398,6 +403,11 @@ defs: search: "special-errors: key-busy" export: - "{(?P[^}]+)} special-errors: key-busy (?P\\d+) record-too-big (?P\\d+)" + - + setName: "nsTouch" + search: "read-touch: tsvc" + export: + - "{(?P[^}]+)} read-touch: tsvc \\((?P\\d+),(?P\\d+)\\) all-triggers \\((?P\\d+),(?P\\d+),(?P\\d+),(?P\\d+)\\)" - setName: "nsClient" search: "client: tsvc"