From ba0cae444ee2945c79f48010a63b26679ea44479 Mon Sep 17 00:00:00 2001 From: josunect Date: Wed, 28 Jun 2023 13:36:24 +0100 Subject: [PATCH 1/5] Update CRD schema --- crd-docs/crd/kiali.io_kialis.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/crd-docs/crd/kiali.io_kialis.yaml b/crd-docs/crd/kiali.io_kialis.yaml index 34a67130..c1040012 100644 --- a/crd-docs/crd/kiali.io_kialis.yaml +++ b/crd-docs/crd/kiali.io_kialis.yaml @@ -1057,6 +1057,9 @@ spec: expression: description: "The find expression." type: string + auto_enable: + description: "Enabled option by default" + type: boolean hide_options: description: "A list of commonly used and useful hide expressions that will be provided to the user out-of-box." type: array @@ -1069,6 +1072,9 @@ spec: expression: type: string description: "The hide expression." + auto_enable: + description: "Enabled option by default" + type: boolean traffic: description: "These settings determine which rates are used to determine graph traffic." type: object From bfdd3b50619a3baa1588f22ae69223f0929bac36 Mon Sep 17 00:00:00 2001 From: josunect Date: Wed, 28 Jun 2023 14:01:49 +0100 Subject: [PATCH 2/5] Alphabetized list, add default values --- crd-docs/crd/kiali.io_kialis.yaml | 12 +++++------ roles/default/kiali-deploy/defaults/main.yml | 21 +++++++++++++------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/crd-docs/crd/kiali.io_kialis.yaml b/crd-docs/crd/kiali.io_kialis.yaml index c1040012..db6ed448 100644 --- a/crd-docs/crd/kiali.io_kialis.yaml +++ b/crd-docs/crd/kiali.io_kialis.yaml @@ -1051,30 +1051,30 @@ spec: items: type: object properties: + auto_enable: + description: "Enabled option by default" + type: boolean description: description: "Human-readable text to let the user know what the expression does." type: string expression: description: "The find expression." type: string - auto_enable: - description: "Enabled option by default" - type: boolean hide_options: description: "A list of commonly used and useful hide expressions that will be provided to the user out-of-box." type: array items: type: object properties: + auto_enable: + description: "Enabled option by default" + type: boolean description: description: "Human-readable text to let the user know what the expression does." type: string expression: type: string description: "The hide expression." - auto_enable: - description: "Enabled option by default" - type: boolean 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 a39d9b7b..1e757f8e 100644 --- a/roles/default/kiali-deploy/defaults/main.yml +++ b/roles/default/kiali-deploy/defaults/main.yml @@ -257,20 +257,27 @@ kiali_defaults: ui_defaults: graph: find_options: - - description: "Find: slow edges (> 1s)" + - auto_enable: false + description: "Find: slow edges (> 1s)" expression: "rt > 1000" - - description: "Find: unhealthy nodes" + - auto_enable: false + description: "Find: unhealthy nodes" expression: "! healthy" - - description: "Find: unknown nodes" + - auto_enable: false + description: "Find: unknown nodes" expression: "name = unknown" - - description: "Find: nodes with the 2 top rankings" + - auto_enable: false + description: "Find: nodes with the 2 top rankings" expression: "rank <= 2" hide_options: - - description: "Hide: healthy nodes" + - auto_enable: false + description: "Hide: healthy nodes" expression: "healthy" - - description: "Hide: unknown nodes" + - auto_enable: false + description: "Hide: unknown nodes" expression: "name = unknown" - - description: "Hide: nodes ranked lower than the 2 top rankings" + - auto_enable: false + description: "Hide: nodes ranked lower than the 2 top rankings" expression: "rank > 2" settings: font_label: 13 From 46fa6ea369b0f5ce4d96c972ee86d81b05877881 Mon Sep 17 00:00:00 2001 From: Josune Cordoba <49480155+josunect@users.noreply.github.com> Date: Thu, 29 Jun 2023 08:12:44 +0100 Subject: [PATCH 3/5] Update crd-docs/crd/kiali.io_kialis.yaml Co-authored-by: John Mazzitelli --- crd-docs/crd/kiali.io_kialis.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crd-docs/crd/kiali.io_kialis.yaml b/crd-docs/crd/kiali.io_kialis.yaml index db6ed448..88532a8f 100644 --- a/crd-docs/crd/kiali.io_kialis.yaml +++ b/crd-docs/crd/kiali.io_kialis.yaml @@ -1051,8 +1051,8 @@ spec: items: type: object properties: - auto_enable: - description: "Enabled option by default" + auto_select: + description: "If true this option will be selected and take effect automatically. Note that only one option in the list can have this value be set to true." type: boolean description: description: "Human-readable text to let the user know what the expression does." From 50a4e98194e622f42063ad75e738564eaea5009d Mon Sep 17 00:00:00 2001 From: Josune Cordoba <49480155+josunect@users.noreply.github.com> Date: Thu, 29 Jun 2023 08:12:58 +0100 Subject: [PATCH 4/5] Update crd-docs/crd/kiali.io_kialis.yaml Co-authored-by: John Mazzitelli --- crd-docs/crd/kiali.io_kialis.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crd-docs/crd/kiali.io_kialis.yaml b/crd-docs/crd/kiali.io_kialis.yaml index 88532a8f..ca17dd42 100644 --- a/crd-docs/crd/kiali.io_kialis.yaml +++ b/crd-docs/crd/kiali.io_kialis.yaml @@ -1066,8 +1066,8 @@ spec: items: type: object properties: - auto_enable: - description: "Enabled option by default" + auto_select: + description: "If true this option will be selected and take effect automatically. Note that only one option in the list can have this value be set to true." type: boolean description: description: "Human-readable text to let the user know what the expression does." From c7cf25933ab4b1ba075bb678dd747f58aa328a15 Mon Sep 17 00:00:00 2001 From: josunect Date: Thu, 29 Jun 2023 09:43:13 +0100 Subject: [PATCH 5/5] Update property name --- roles/default/kiali-deploy/defaults/main.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/roles/default/kiali-deploy/defaults/main.yml b/roles/default/kiali-deploy/defaults/main.yml index 1e757f8e..157b48c1 100644 --- a/roles/default/kiali-deploy/defaults/main.yml +++ b/roles/default/kiali-deploy/defaults/main.yml @@ -257,26 +257,26 @@ kiali_defaults: ui_defaults: graph: find_options: - - auto_enable: false + - auto_select: false description: "Find: slow edges (> 1s)" expression: "rt > 1000" - - auto_enable: false + - auto_select: false description: "Find: unhealthy nodes" expression: "! healthy" - - auto_enable: false + - auto_select: false description: "Find: unknown nodes" expression: "name = unknown" - - auto_enable: false + - auto_select: false description: "Find: nodes with the 2 top rankings" expression: "rank <= 2" hide_options: - - auto_enable: false + - auto_select: false description: "Hide: healthy nodes" expression: "healthy" - - auto_enable: false + - auto_select: false description: "Hide: unknown nodes" expression: "name = unknown" - - auto_enable: false + - auto_select: false description: "Hide: nodes ranked lower than the 2 top rankings" expression: "rank > 2" settings: