From 666645f79176c474b4755475e7aebeb91a43418f Mon Sep 17 00:00:00 2001 From: Jay Shaughnessy Date: Fri, 22 Nov 2024 14:01:33 -0500 Subject: [PATCH 1/4] Add new graph setting for the animation style --- crd-docs/crd/kiali.io_kialis.yaml | 8 ++++++++ roles/default/kiali-deploy/defaults/main.yml | 1 + 2 files changed, 9 insertions(+) diff --git a/crd-docs/crd/kiali.io_kialis.yaml b/crd-docs/crd/kiali.io_kialis.yaml index a0916706..c36d7053 100644 --- a/crd-docs/crd/kiali.io_kialis.yaml +++ b/crd-docs/crd/kiali.io_kialis.yaml @@ -1248,6 +1248,14 @@ spec: expression: type: string description: "The hide expression." + settings: + description: "Various presentation options." + type: object + properties: + animation: + description: "The traffic animation style. Value must be one of: `dash` or `point`. Default is `point`." + type: string + enum: ["dash", "point" ] traffic: description: "These settings determine which rates are used to determine graph traffic." type: object diff --git a/roles/default/kiali-deploy/defaults/main.yml b/roles/default/kiali-deploy/defaults/main.yml index a4f59f78..29633468 100644 --- a/roles/default/kiali-deploy/defaults/main.yml +++ b/roles/default/kiali-deploy/defaults/main.yml @@ -278,6 +278,7 @@ kiali_defaults: description: "Hide: nodes ranked lower than the 2 top rankings" expression: "rank > 2" settings: + animation: "point" font_label: 13 min_font_badge: 7 min_font_label: 10 From 28bb6df75946d11caeae57524440733349e8bc24 Mon Sep 17 00:00:00 2001 From: Jay Shaughnessy Date: Sun, 24 Nov 2024 18:41:35 -0500 Subject: [PATCH 2/4] Update crd-docs/crd/kiali.io_kialis.yaml Co-authored-by: John Mazzitelli --- crd-docs/crd/kiali.io_kialis.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crd-docs/crd/kiali.io_kialis.yaml b/crd-docs/crd/kiali.io_kialis.yaml index c36d7053..52b22e45 100644 --- a/crd-docs/crd/kiali.io_kialis.yaml +++ b/crd-docs/crd/kiali.io_kialis.yaml @@ -1255,7 +1255,7 @@ spec: animation: description: "The traffic animation style. Value must be one of: `dash` or `point`. Default is `point`." type: string - enum: ["dash", "point" ] + enum: ["dash", "point"] traffic: description: "These settings determine which rates are used to determine graph traffic." type: object From 9fbe9b644faef3a431d07579501fbb5dd0736ab5 Mon Sep 17 00:00:00 2001 From: Jay Shaughnessy Date: Mon, 25 Nov 2024 09:16:07 -0500 Subject: [PATCH 3/4] pr feedback: mazz - add missing settings --- crd-docs/cr/kiali.io_v1alpha1_kiali.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/crd-docs/cr/kiali.io_v1alpha1_kiali.yaml b/crd-docs/cr/kiali.io_v1alpha1_kiali.yaml index 22ca29cc..7d7420f8 100644 --- a/crd-docs/cr/kiali.io_v1alpha1_kiali.yaml +++ b/crd-docs/cr/kiali.io_v1alpha1_kiali.yaml @@ -445,7 +445,10 @@ spec: expression: "healthy" - description: "Hide: unknown nodes" expression: "name = unknown" + settings: + animation: "point" traffic: + ambient: "total" grpc: "requests" http: "requests" tcp: "sent" From ef9199fc70c90c9190712214b2e5e50203f92344 Mon Sep 17 00:00:00 2001 From: Jay Shaughnessy Date: Mon, 25 Nov 2024 10:38:21 -0500 Subject: [PATCH 4/4] pr feedback: mazz - now need to add other missing ambient traffic entries --- crd-docs/crd/kiali.io_kialis.yaml | 4 ++++ roles/default/kiali-deploy/defaults/main.yml | 1 + 2 files changed, 5 insertions(+) diff --git a/crd-docs/crd/kiali.io_kialis.yaml b/crd-docs/crd/kiali.io_kialis.yaml index 52b22e45..1f821ec3 100644 --- a/crd-docs/crd/kiali.io_kialis.yaml +++ b/crd-docs/crd/kiali.io_kialis.yaml @@ -1260,6 +1260,10 @@ spec: description: "These settings determine which rates are used to determine graph traffic." type: object properties: + ambient: + description: "Ambient traffic is reported by ztunnel and/or waypoints. Value must be one of: `none`, `total`, `waypoint`, or `ztunnel`." + type: string + enum: ["none", "total", "waypoint", "ztunnel"] grpc: description: "gRPC traffic is measured in requests or sent/received/total messages. Value must be one of: `none`, `requests`, `sent`, `received`, or `total`." type: string diff --git a/roles/default/kiali-deploy/defaults/main.yml b/roles/default/kiali-deploy/defaults/main.yml index 29633468..09847f67 100644 --- a/roles/default/kiali-deploy/defaults/main.yml +++ b/roles/default/kiali-deploy/defaults/main.yml @@ -283,6 +283,7 @@ kiali_defaults: min_font_badge: 7 min_font_label: 10 traffic: + ambient: "total" grpc: "requests" http: "requests" tcp: "sent"