From 005dc7463619f6e8e3490e712ba33b59cce9f4fa Mon Sep 17 00:00:00 2001 From: Kyle Pollich Date: Mon, 23 Jan 2023 08:40:52 -0500 Subject: [PATCH 1/3] Enable experimental toggles in Fleet UI from Kibana config --- internal/profile/_static/kibana_config_default.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/profile/_static/kibana_config_default.yml b/internal/profile/_static/kibana_config_default.yml index 124f0ff74c..c3d9a1f88f 100644 --- a/internal/profile/_static/kibana_config_default.yml +++ b/internal/profile/_static/kibana_config_default.yml @@ -5,7 +5,7 @@ server.ssl.certificate: "/usr/share/kibana/config/certs/cert.pem" server.ssl.key: "/usr/share/kibana/config/certs/key.pem" server.ssl.certificateAuthorities: ["/usr/share/kibana/config/certs/ca-cert.pem"] -elasticsearch.hosts: [ "https://elasticsearch:9200" ] +elasticsearch.hosts: ["https://elasticsearch:9200"] elasticsearch.ssl.certificateAuthorities: "/usr/share/kibana/config/certs/ca-cert.pem" elasticsearch.username: elastic elasticsearch.password: changeme @@ -17,5 +17,6 @@ xpack.fleet.registryUrl: "https://package-registry:8080" xpack.fleet.agents.enabled: true xpack.fleet.agents.elasticsearch.host: "https://elasticsearch:9200" xpack.fleet.agents.fleet_server.hosts: ["https://fleet-server:8220"] +xpack.fleet.enableExperimental: ["experimentalDataStreamSettings"] # Enable experimental toggles in Fleet UI xpack.encryptedSavedObjects.encryptionKey: "12345678901234567890123456789012" From d9000c7ce22f7af116e1cf5e20428146d3ad7be9 Mon Sep 17 00:00:00 2001 From: Kyle Pollich Date: Mon, 23 Jan 2023 10:30:38 -0500 Subject: [PATCH 2/3] Move feature flag opt-in to kibana_config_8x.yml --- internal/profile/_static/kibana_config_8x.yml | 5 +++-- internal/profile/_static/kibana_config_default.yml | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/profile/_static/kibana_config_8x.yml b/internal/profile/_static/kibana_config_8x.yml index 6d9564c00f..c7ac34d53e 100644 --- a/internal/profile/_static/kibana_config_8x.yml +++ b/internal/profile/_static/kibana_config_8x.yml @@ -5,7 +5,7 @@ server.ssl.certificate: "/usr/share/kibana/config/certs/cert.pem" server.ssl.key: "/usr/share/kibana/config/certs/key.pem" server.ssl.certificateAuthorities: ["/usr/share/kibana/config/certs/ca-cert.pem"] -elasticsearch.hosts: [ "https://elasticsearch:9200" ] +elasticsearch.hosts: ["https://elasticsearch:9200"] elasticsearch.ssl.certificateAuthorities: "/usr/share/kibana/config/certs/ca-cert.pem" elasticsearch.serviceAccountToken: "AAEAAWVsYXN0aWMva2liYW5hL2VsYXN0aWMtcGFja2FnZS1raWJhbmEtdG9rZW46b2x4b051SWNRa0tYMHdXazdLWmFBdw" @@ -15,6 +15,7 @@ xpack.fleet.registryUrl: "https://package-registry:8080" xpack.fleet.agents.enabled: true xpack.fleet.agents.elasticsearch.hosts: ["https://elasticsearch:9200"] xpack.fleet.agents.fleet_server.hosts: ["https://fleet-server:8220"] +xpack.fleet.enableExperimental: ["experimentalDataStreamSettings"] # Enable experimental toggles in Fleet UI xpack.encryptedSavedObjects.encryptionKey: "12345678901234567890123456789012" @@ -55,7 +56,7 @@ xpack.fleet.outputs: - id: fleet-default-output name: default type: elasticsearch - hosts: [ https://elasticsearch:9200 ] + hosts: [https://elasticsearch:9200] ca_trusted_fingerprint: "${ELASTIC_PACKAGE_CA_TRUSTED_FINGERPRINT}" is_default: true is_default_monitoring: true diff --git a/internal/profile/_static/kibana_config_default.yml b/internal/profile/_static/kibana_config_default.yml index c3d9a1f88f..2302530b40 100644 --- a/internal/profile/_static/kibana_config_default.yml +++ b/internal/profile/_static/kibana_config_default.yml @@ -17,6 +17,5 @@ xpack.fleet.registryUrl: "https://package-registry:8080" xpack.fleet.agents.enabled: true xpack.fleet.agents.elasticsearch.host: "https://elasticsearch:9200" xpack.fleet.agents.fleet_server.hosts: ["https://fleet-server:8220"] -xpack.fleet.enableExperimental: ["experimentalDataStreamSettings"] # Enable experimental toggles in Fleet UI xpack.encryptedSavedObjects.encryptionKey: "12345678901234567890123456789012" From 23705941a7b929930b4495e24b3d8d3e4161e798 Mon Sep 17 00:00:00 2001 From: Kyle Pollich Date: Mon, 23 Jan 2023 11:01:34 -0500 Subject: [PATCH 3/3] Update internal/profile/_static/kibana_config_8x.yml Co-authored-by: Nicolas Ruflin --- internal/profile/_static/kibana_config_8x.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/profile/_static/kibana_config_8x.yml b/internal/profile/_static/kibana_config_8x.yml index c7ac34d53e..8f9001eb3f 100644 --- a/internal/profile/_static/kibana_config_8x.yml +++ b/internal/profile/_static/kibana_config_8x.yml @@ -56,7 +56,7 @@ xpack.fleet.outputs: - id: fleet-default-output name: default type: elasticsearch - hosts: [https://elasticsearch:9200] + hosts: ["https://elasticsearch:9200"] ca_trusted_fingerprint: "${ELASTIC_PACKAGE_CA_TRUSTED_FINGERPRINT}" is_default: true is_default_monitoring: true