From 5ce707225282f8434e0011efb65e9fc6f6f3ac23 Mon Sep 17 00:00:00 2001 From: Daniel Scholl Date: Thu, 26 Sep 2024 07:51:43 -0500 Subject: [PATCH 01/26] Added ingress to elastic and removed istio mesh from website. --- software/applications/web-site/namespace.yaml | 2 +- .../components/elastic-search/ingress.yaml | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 software/components/elastic-search/ingress.yaml diff --git a/software/applications/web-site/namespace.yaml b/software/applications/web-site/namespace.yaml index a5a2b469..c6888b71 100644 --- a/software/applications/web-site/namespace.yaml +++ b/software/applications/web-site/namespace.yaml @@ -4,4 +4,4 @@ metadata: name: web-site labels: toolkit.fluxcd.io/tenant: dev-team - istio-injection: enabled + istio-injection: disabled diff --git a/software/components/elastic-search/ingress.yaml b/software/components/elastic-search/ingress.yaml new file mode 100644 index 00000000..ce45445c --- /dev/null +++ b/software/components/elastic-search/ingress.yaml @@ -0,0 +1,23 @@ +--- +apiVersion: networking.istio.io/v1alpha3 +kind: VirtualService +metadata: + name: kibana + namespace: elastic-search +spec: + hosts: + - "*" + gateways: + - istio-system/internal-gateway + - istio-system/external-gateway + http: + - match: + - uri: + prefix: "/elastic" + rewrite: + uri: "/" + route: + - destination: + host: "kibana-kb-http.elastic-search.svc.cluster.local" + port: + number: 5601 \ No newline at end of file From 3158c5aadf16ec3b94eb40a9a2d4c8bd1459918d Mon Sep 17 00:00:00 2001 From: Daniel Scholl Date: Thu, 26 Sep 2024 07:59:26 -0500 Subject: [PATCH 02/26] Added ingress to elastic and removed istio mesh from website. --- software/applications/web-site/ingress.yaml | 23 --------------------- 1 file changed, 23 deletions(-) diff --git a/software/applications/web-site/ingress.yaml b/software/applications/web-site/ingress.yaml index 05d63626..46eb632a 100644 --- a/software/applications/web-site/ingress.yaml +++ b/software/applications/web-site/ingress.yaml @@ -1,27 +1,4 @@ --- -apiVersion: security.istio.io/v1beta1 -kind: PeerAuthentication -metadata: - name: default - namespace: web-site -spec: - mtls: - mode: STRICT ---- -apiVersion: networking.istio.io/v1beta1 -kind: DestinationRule -metadata: - name: web-site-rule - namespace: web-site -spec: - host: osdu-developer-web-service.web-site.svc.cluster.local - trafficPolicy: - connectionPool: - tcp: - maxConnections: 100 - tls: - mode: ISTIO_MUTUAL ---- apiVersion: networking.istio.io/v1alpha3 kind: VirtualService metadata: From 42a173768a652d805dd92fe7aca766b92485841b Mon Sep 17 00:00:00 2001 From: Daniel Scholl Date: Thu, 26 Sep 2024 08:07:33 -0500 Subject: [PATCH 03/26] Added https to kibana --- software/components/elastic-search/ingress.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/software/components/elastic-search/ingress.yaml b/software/components/elastic-search/ingress.yaml index ce45445c..d7d65dac 100644 --- a/software/components/elastic-search/ingress.yaml +++ b/software/components/elastic-search/ingress.yaml @@ -20,4 +20,6 @@ spec: - destination: host: "kibana-kb-http.elastic-search.svc.cluster.local" port: - number: 5601 \ No newline at end of file + number: 5601 + tls: + mode: SIMPLE \ No newline at end of file From 3e9bace49b36d236e45b78f4a440e59e04de55ec Mon Sep 17 00:00:00 2001 From: Daniel Scholl Date: Thu, 26 Sep 2024 08:24:53 -0500 Subject: [PATCH 04/26] Added https to kibana --- software/components/elastic-search/ingress.yaml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/software/components/elastic-search/ingress.yaml b/software/components/elastic-search/ingress.yaml index d7d65dac..af2664ce 100644 --- a/software/components/elastic-search/ingress.yaml +++ b/software/components/elastic-search/ingress.yaml @@ -1,5 +1,15 @@ --- apiVersion: networking.istio.io/v1alpha3 +kind: DestinationRule +metadata: + name: kibana-destination +spec: + host: kibana-kb-http.elastic-search.svc.cluster.local + trafficPolicy: + tls: + mode: SIMPLE +--- +apiVersion: networking.istio.io/v1alpha3 kind: VirtualService metadata: name: kibana @@ -20,6 +30,4 @@ spec: - destination: host: "kibana-kb-http.elastic-search.svc.cluster.local" port: - number: 5601 - tls: - mode: SIMPLE \ No newline at end of file + number: 5601 \ No newline at end of file From 1a35ba6d041819d5ac5bd5164e9fdfd5afa052a7 Mon Sep 17 00:00:00 2001 From: Daniel Scholl Date: Thu, 26 Sep 2024 08:28:04 -0500 Subject: [PATCH 05/26] Added https to kibana --- software/components/elastic-search/ingress.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/software/components/elastic-search/ingress.yaml b/software/components/elastic-search/ingress.yaml index af2664ce..bb8c2700 100644 --- a/software/components/elastic-search/ingress.yaml +++ b/software/components/elastic-search/ingress.yaml @@ -3,6 +3,7 @@ apiVersion: networking.istio.io/v1alpha3 kind: DestinationRule metadata: name: kibana-destination + namespace: elastic-search spec: host: kibana-kb-http.elastic-search.svc.cluster.local trafficPolicy: From bfed2399fd7b17445cbbf08aa006002b38565361 Mon Sep 17 00:00:00 2001 From: Daniel Scholl Date: Thu, 26 Sep 2024 08:32:31 -0500 Subject: [PATCH 06/26] Added https to kibana --- software/components/elastic-search/ingress.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/software/components/elastic-search/ingress.yaml b/software/components/elastic-search/ingress.yaml index bb8c2700..6ce9d327 100644 --- a/software/components/elastic-search/ingress.yaml +++ b/software/components/elastic-search/ingress.yaml @@ -8,7 +8,8 @@ spec: host: kibana-kb-http.elastic-search.svc.cluster.local trafficPolicy: tls: - mode: SIMPLE + mode: SIMPLE + insecureSkipVerify: true --- apiVersion: networking.istio.io/v1alpha3 kind: VirtualService From 3ecc26fbd77f749487e862d2f8b595194832f27b Mon Sep 17 00:00:00 2001 From: Daniel Scholl Date: Thu, 26 Sep 2024 09:03:16 -0500 Subject: [PATCH 07/26] Added https to kibana --- software/components/elastic-search/ingress.yaml | 2 -- software/components/elastic-search/kibana.yaml | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/software/components/elastic-search/ingress.yaml b/software/components/elastic-search/ingress.yaml index 6ce9d327..4a9bf658 100644 --- a/software/components/elastic-search/ingress.yaml +++ b/software/components/elastic-search/ingress.yaml @@ -26,8 +26,6 @@ spec: - match: - uri: prefix: "/elastic" - rewrite: - uri: "/" route: - destination: host: "kibana-kb-http.elastic-search.svc.cluster.local" diff --git a/software/components/elastic-search/kibana.yaml b/software/components/elastic-search/kibana.yaml index 2aa66fb5..26ee7a6f 100644 --- a/software/components/elastic-search/kibana.yaml +++ b/software/components/elastic-search/kibana.yaml @@ -9,6 +9,8 @@ spec: elasticsearchRef: name: "elasticsearch" count: 3 + config: + server.basePath: "/elastic" podTemplate: spec: tolerations: From a0f4e3c6f4fde8e75f867d4164622b68dc635b08 Mon Sep 17 00:00:00 2001 From: Daniel Scholl Date: Sun, 29 Sep 2024 09:05:24 -0500 Subject: [PATCH 08/26] Updated kibana version. --- software/components/elastic-search/kibana.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/software/components/elastic-search/kibana.yaml b/software/components/elastic-search/kibana.yaml index 26ee7a6f..a8738741 100644 --- a/software/components/elastic-search/kibana.yaml +++ b/software/components/elastic-search/kibana.yaml @@ -5,7 +5,7 @@ metadata: name: kibana namespace: elastic-search spec: - version: 7.17.22 + version: 8.15.2 elasticsearchRef: name: "elasticsearch" count: 3 From 79bcad5d37a54966d4e0330229784145a71c4c96 Mon Sep 17 00:00:00 2001 From: Daniel Scholl Date: Sun, 29 Sep 2024 09:27:14 -0500 Subject: [PATCH 09/26] Updated kibana path. --- software/components/elastic-search/elastic-search.yaml | 2 +- software/components/elastic-search/ingress.yaml | 2 +- software/components/elastic-search/kibana.yaml | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/software/components/elastic-search/elastic-search.yaml b/software/components/elastic-search/elastic-search.yaml index 54601daf..64263286 100644 --- a/software/components/elastic-search/elastic-search.yaml +++ b/software/components/elastic-search/elastic-search.yaml @@ -6,7 +6,7 @@ metadata: annotations: eck.k8s.elastic.co/downward-node-labels: "topology.kubernetes.io/zone" spec: - version: 7.17.22 + version: 7.17.24 http: tls: selfSignedCertificate: diff --git a/software/components/elastic-search/ingress.yaml b/software/components/elastic-search/ingress.yaml index 4a9bf658..05092598 100644 --- a/software/components/elastic-search/ingress.yaml +++ b/software/components/elastic-search/ingress.yaml @@ -25,7 +25,7 @@ spec: http: - match: - uri: - prefix: "/elastic" + prefix: "/kibana" route: - destination: host: "kibana-kb-http.elastic-search.svc.cluster.local" diff --git a/software/components/elastic-search/kibana.yaml b/software/components/elastic-search/kibana.yaml index a8738741..04f1508b 100644 --- a/software/components/elastic-search/kibana.yaml +++ b/software/components/elastic-search/kibana.yaml @@ -5,12 +5,13 @@ metadata: name: kibana namespace: elastic-search spec: - version: 8.15.2 + version: 7.17.24 elasticsearchRef: name: "elasticsearch" count: 3 config: - server.basePath: "/elastic" + server.basePath: "/kibana" + server.rewriteBasePath: true podTemplate: spec: tolerations: From 963435d9e665bf3bfc6ee1be4420aa7b1e32872a Mon Sep 17 00:00:00 2001 From: Daniel Scholl Date: Mon, 30 Sep 2024 07:38:47 -0500 Subject: [PATCH 10/26] Updated elastic version --- software/components/elastic-search/elastic-search.yaml | 3 ++- software/components/elastic-search/kibana.yaml | 4 ++-- software/components/osdu-system/elastic.yaml | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/software/components/elastic-search/elastic-search.yaml b/software/components/elastic-search/elastic-search.yaml index 64263286..d02b843a 100644 --- a/software/components/elastic-search/elastic-search.yaml +++ b/software/components/elastic-search/elastic-search.yaml @@ -6,7 +6,8 @@ metadata: annotations: eck.k8s.elastic.co/downward-node-labels: "topology.kubernetes.io/zone" spec: - version: 7.17.24 + # version: 7.17.24 + version: 8.15.2 http: tls: selfSignedCertificate: diff --git a/software/components/elastic-search/kibana.yaml b/software/components/elastic-search/kibana.yaml index 04f1508b..b004dc2b 100644 --- a/software/components/elastic-search/kibana.yaml +++ b/software/components/elastic-search/kibana.yaml @@ -5,13 +5,13 @@ metadata: name: kibana namespace: elastic-search spec: - version: 7.17.24 + # version: 7.17.24 + version: 8.15.2 elasticsearchRef: name: "elasticsearch" count: 3 config: server.basePath: "/kibana" - server.rewriteBasePath: true podTemplate: spec: tolerations: diff --git a/software/components/osdu-system/elastic.yaml b/software/components/osdu-system/elastic.yaml index b500be9e..5380b35a 100644 --- a/software/components/osdu-system/elastic.yaml +++ b/software/components/osdu-system/elastic.yaml @@ -8,7 +8,7 @@ spec: interval: 5m url: https://github.com/elastic/cloud-on-k8s ref: - branch: "2.5" + branch: "2.14" ignore: | # exclude all /* From 6f21bd946a3040bc873fa1ded0a31fdbef54ff9a Mon Sep 17 00:00:00 2001 From: Daniel Scholl Date: Mon, 30 Sep 2024 08:00:07 -0500 Subject: [PATCH 11/26] Attempted changed to kibana --- software/components/elastic-search/kibana.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/software/components/elastic-search/kibana.yaml b/software/components/elastic-search/kibana.yaml index b004dc2b..f10937d8 100644 --- a/software/components/elastic-search/kibana.yaml +++ b/software/components/elastic-search/kibana.yaml @@ -11,7 +11,11 @@ spec: name: "elasticsearch" count: 3 config: + server.port: 5601 + server.publicBaseUrl: "http://localhost:5601/kibana" + server.host: "localhost" server.basePath: "/kibana" + server.rewriteBasePath: true podTemplate: spec: tolerations: From 1023842d76bdda61504788669c430edef691897b Mon Sep 17 00:00:00 2001 From: Daniel Scholl Date: Mon, 30 Sep 2024 08:04:27 -0500 Subject: [PATCH 12/26] Attempted changed to kibana --- software/components/elastic-search/kibana.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/software/components/elastic-search/kibana.yaml b/software/components/elastic-search/kibana.yaml index f10937d8..36126d54 100644 --- a/software/components/elastic-search/kibana.yaml +++ b/software/components/elastic-search/kibana.yaml @@ -15,7 +15,7 @@ spec: server.publicBaseUrl: "http://localhost:5601/kibana" server.host: "localhost" server.basePath: "/kibana" - server.rewriteBasePath: true + # server.rewriteBasePath: true podTemplate: spec: tolerations: From 7550794d3584fd2249eeeb5b9173f4790dfbcfd1 Mon Sep 17 00:00:00 2001 From: Daniel Scholl Date: Mon, 30 Sep 2024 08:20:45 -0500 Subject: [PATCH 13/26] Attempted changed to kibana --- .../components/elastic-search/kibana.yaml | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/software/components/elastic-search/kibana.yaml b/software/components/elastic-search/kibana.yaml index 36126d54..ab1a5e7d 100644 --- a/software/components/elastic-search/kibana.yaml +++ b/software/components/elastic-search/kibana.yaml @@ -11,13 +11,25 @@ spec: name: "elasticsearch" count: 3 config: - server.port: 5601 - server.publicBaseUrl: "http://localhost:5601/kibana" - server.host: "localhost" - server.basePath: "/kibana" + # server.port: 5601 + # server.publicBaseUrl: "http://localhost:5601/kibana" + # server.host: "localhost" + # server.basePath: "/kibana" # server.rewriteBasePath: true podTemplate: spec: + containers: + - name: kibana + readinessProbe: + failureThreshold: 3 + initialDelaySeconds: 10 + periodSeconds: 10 + successThreshold: 1 + exec: + command: + - /bin/bash + - -c + - curl -o /dev/null -w "%{http_code}" https://127.0.0.1:5601/login -k -s tolerations: - effect: NoSchedule key: app From a79c1cb2047d8dd1d1fcf64ddb973a235e15efb6 Mon Sep 17 00:00:00 2001 From: Daniel Scholl Date: Mon, 30 Sep 2024 08:24:39 -0500 Subject: [PATCH 14/26] Attempted changed to kibana --- .../components/elastic-search/kibana.yaml | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/software/components/elastic-search/kibana.yaml b/software/components/elastic-search/kibana.yaml index ab1a5e7d..a4abb673 100644 --- a/software/components/elastic-search/kibana.yaml +++ b/software/components/elastic-search/kibana.yaml @@ -18,18 +18,6 @@ spec: # server.rewriteBasePath: true podTemplate: spec: - containers: - - name: kibana - readinessProbe: - failureThreshold: 3 - initialDelaySeconds: 10 - periodSeconds: 10 - successThreshold: 1 - exec: - command: - - /bin/bash - - -c - - curl -o /dev/null -w "%{http_code}" https://127.0.0.1:5601/login -k -s tolerations: - effect: NoSchedule key: app @@ -54,6 +42,16 @@ spec: - "$(REGION)-3" containers: - name: kibana + readinessProbe: + failureThreshold: 3 + initialDelaySeconds: 10 + periodSeconds: 10 + successThreshold: 1 + exec: + command: + - /bin/bash + - -c + - curl -o /dev/null -w "%{http_code}" https://127.0.0.1:5601/login -k -s env: - name: xpack.encryptedSavedObjects.encryptionKey valueFrom: From 26fb242c5fccd407941ce67547f51014cd86fa48 Mon Sep 17 00:00:00 2001 From: Daniel Scholl Date: Mon, 30 Sep 2024 08:27:54 -0500 Subject: [PATCH 15/26] Attempted changed to kibana --- software/components/elastic-search/kibana.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/software/components/elastic-search/kibana.yaml b/software/components/elastic-search/kibana.yaml index a4abb673..826e74cc 100644 --- a/software/components/elastic-search/kibana.yaml +++ b/software/components/elastic-search/kibana.yaml @@ -11,7 +11,7 @@ spec: name: "elasticsearch" count: 3 config: - # server.port: 5601 + server.port: 5601 # server.publicBaseUrl: "http://localhost:5601/kibana" # server.host: "localhost" # server.basePath: "/kibana" From e55d31cfd173ec567750a62994090bcdf8cc0304 Mon Sep 17 00:00:00 2001 From: Daniel Scholl Date: Mon, 30 Sep 2024 08:37:16 -0500 Subject: [PATCH 16/26] Attempted changed to kibana --- software/components/elastic-search/kibana.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/software/components/elastic-search/kibana.yaml b/software/components/elastic-search/kibana.yaml index 826e74cc..d894ec87 100644 --- a/software/components/elastic-search/kibana.yaml +++ b/software/components/elastic-search/kibana.yaml @@ -12,9 +12,9 @@ spec: count: 3 config: server.port: 5601 - # server.publicBaseUrl: "http://localhost:5601/kibana" - # server.host: "localhost" - # server.basePath: "/kibana" + server.publicBaseUrl: "https://localhost:5601/kibana" + server.host: "localhost" + server.basePath: "/kibana" # server.rewriteBasePath: true podTemplate: spec: @@ -51,7 +51,7 @@ spec: command: - /bin/bash - -c - - curl -o /dev/null -w "%{http_code}" https://127.0.0.1:5601/login -k -s + - curl -o /dev/null -w "%{http_code}" https://127.0.0.1:5601/kibana/login -k -s env: - name: xpack.encryptedSavedObjects.encryptionKey valueFrom: From 3ca95baa29a343b9b053bd1e7306033056b04dfa Mon Sep 17 00:00:00 2001 From: Daniel Scholl Date: Mon, 30 Sep 2024 08:41:21 -0500 Subject: [PATCH 17/26] Attempted changed to kibana --- software/components/elastic-search/kibana.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/software/components/elastic-search/kibana.yaml b/software/components/elastic-search/kibana.yaml index d894ec87..24763379 100644 --- a/software/components/elastic-search/kibana.yaml +++ b/software/components/elastic-search/kibana.yaml @@ -51,7 +51,7 @@ spec: command: - /bin/bash - -c - - curl -o /dev/null -w "%{http_code}" https://127.0.0.1:5601/kibana/login -k -s + - curl -o /dev/null -w "%{http_code}" https://127.0.0.1:5601/login -k -s env: - name: xpack.encryptedSavedObjects.encryptionKey valueFrom: From 996ed7abdcc38b4962b5bd4a034cb91560fdddeb Mon Sep 17 00:00:00 2001 From: Daniel Scholl Date: Mon, 30 Sep 2024 08:58:04 -0500 Subject: [PATCH 18/26] Attempted changed to kibana --- .../components/elastic-search/kibana.yaml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/software/components/elastic-search/kibana.yaml b/software/components/elastic-search/kibana.yaml index 24763379..6a80b9f4 100644 --- a/software/components/elastic-search/kibana.yaml +++ b/software/components/elastic-search/kibana.yaml @@ -41,17 +41,17 @@ spec: - "$(REGION)-2" - "$(REGION)-3" containers: - - name: kibana - readinessProbe: - failureThreshold: 3 - initialDelaySeconds: 10 - periodSeconds: 10 - successThreshold: 1 - exec: - command: - - /bin/bash - - -c - - curl -o /dev/null -w "%{http_code}" https://127.0.0.1:5601/login -k -s + # - name: kibana + # readinessProbe: + # failureThreshold: 3 + # initialDelaySeconds: 10 + # periodSeconds: 10 + # successThreshold: 1 + # exec: + # command: + # - /bin/bash + # - -c + # - curl -o /dev/null -w "%{http_code}" https://127.0.0.1:5601/login -k -s env: - name: xpack.encryptedSavedObjects.encryptionKey valueFrom: From ab300bd6347000e43a295979b32fb93a1c1470c4 Mon Sep 17 00:00:00 2001 From: Daniel Scholl Date: Mon, 30 Sep 2024 09:05:40 -0500 Subject: [PATCH 19/26] Attempted changed to kibana --- software/components/elastic-search/kibana.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/software/components/elastic-search/kibana.yaml b/software/components/elastic-search/kibana.yaml index 6a80b9f4..099ef26d 100644 --- a/software/components/elastic-search/kibana.yaml +++ b/software/components/elastic-search/kibana.yaml @@ -12,8 +12,8 @@ spec: count: 3 config: server.port: 5601 - server.publicBaseUrl: "https://localhost:5601/kibana" - server.host: "localhost" + # server.publicBaseUrl: "https://localhost:5601/kibana" + # server.host: "localhost" server.basePath: "/kibana" # server.rewriteBasePath: true podTemplate: From b9564dea141ebd0607128cb0978699486935a52e Mon Sep 17 00:00:00 2001 From: Daniel Scholl Date: Mon, 30 Sep 2024 09:13:26 -0500 Subject: [PATCH 20/26] Attempted changed to kibana --- software/components/elastic-search/kibana.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/software/components/elastic-search/kibana.yaml b/software/components/elastic-search/kibana.yaml index 099ef26d..bbdda656 100644 --- a/software/components/elastic-search/kibana.yaml +++ b/software/components/elastic-search/kibana.yaml @@ -41,7 +41,7 @@ spec: - "$(REGION)-2" - "$(REGION)-3" containers: - # - name: kibana + - name: kibana # readinessProbe: # failureThreshold: 3 # initialDelaySeconds: 10 From d7eca3c47f72c29c19b63ad4699505349de00ced Mon Sep 17 00:00:00 2001 From: Daniel Scholl Date: Mon, 30 Sep 2024 09:22:56 -0500 Subject: [PATCH 21/26] Attempted changed to kibana --- software/components/elastic-search/kibana.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/software/components/elastic-search/kibana.yaml b/software/components/elastic-search/kibana.yaml index bbdda656..8ee9af63 100644 --- a/software/components/elastic-search/kibana.yaml +++ b/software/components/elastic-search/kibana.yaml @@ -12,8 +12,8 @@ spec: count: 3 config: server.port: 5601 - # server.publicBaseUrl: "https://localhost:5601/kibana" - # server.host: "localhost" + server.publicBaseUrl: "https://localhost:5601/kibana" + server.host: "localhost" server.basePath: "/kibana" # server.rewriteBasePath: true podTemplate: From 673730c387e8584afa7c6ca8a09abf7361c5bfea Mon Sep 17 00:00:00 2001 From: Daniel Scholl Date: Mon, 30 Sep 2024 09:32:14 -0500 Subject: [PATCH 22/26] Attempted changed to kibana --- .../components/elastic-search/kibana.yaml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/software/components/elastic-search/kibana.yaml b/software/components/elastic-search/kibana.yaml index 8ee9af63..24763379 100644 --- a/software/components/elastic-search/kibana.yaml +++ b/software/components/elastic-search/kibana.yaml @@ -42,16 +42,16 @@ spec: - "$(REGION)-3" containers: - name: kibana - # readinessProbe: - # failureThreshold: 3 - # initialDelaySeconds: 10 - # periodSeconds: 10 - # successThreshold: 1 - # exec: - # command: - # - /bin/bash - # - -c - # - curl -o /dev/null -w "%{http_code}" https://127.0.0.1:5601/login -k -s + readinessProbe: + failureThreshold: 3 + initialDelaySeconds: 10 + periodSeconds: 10 + successThreshold: 1 + exec: + command: + - /bin/bash + - -c + - curl -o /dev/null -w "%{http_code}" https://127.0.0.1:5601/login -k -s env: - name: xpack.encryptedSavedObjects.encryptionKey valueFrom: From 0c591004cdb4167ea3fa02992b82487fbadc1e05 Mon Sep 17 00:00:00 2001 From: Daniel Scholl Date: Mon, 30 Sep 2024 09:36:10 -0500 Subject: [PATCH 23/26] Attempted changed to kibana --- software/components/elastic-search/kibana.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/software/components/elastic-search/kibana.yaml b/software/components/elastic-search/kibana.yaml index 24763379..0efdafe6 100644 --- a/software/components/elastic-search/kibana.yaml +++ b/software/components/elastic-search/kibana.yaml @@ -51,7 +51,7 @@ spec: command: - /bin/bash - -c - - curl -o /dev/null -w "%{http_code}" https://127.0.0.1:5601/login -k -s + - curl -o /dev/null -w "%{http_code}" https://localhost:5601/kibana/login -k -s env: - name: xpack.encryptedSavedObjects.encryptionKey valueFrom: From 54e5dd6bd661740b8b7d123587c81c757746950b Mon Sep 17 00:00:00 2001 From: Daniel Scholl Date: Mon, 30 Sep 2024 09:59:05 -0500 Subject: [PATCH 24/26] Attempted changed to kibana --- .../components/elastic-search/kibana.yaml | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/software/components/elastic-search/kibana.yaml b/software/components/elastic-search/kibana.yaml index 0efdafe6..342a06d9 100644 --- a/software/components/elastic-search/kibana.yaml +++ b/software/components/elastic-search/kibana.yaml @@ -10,11 +10,11 @@ spec: elasticsearchRef: name: "elasticsearch" count: 3 - config: - server.port: 5601 - server.publicBaseUrl: "https://localhost:5601/kibana" - server.host: "localhost" - server.basePath: "/kibana" + # config: + # server.port: 5601 + # server.publicBaseUrl: "https://localhost:5601/kibana" + # server.host: "localhost" + # server.basePath: "/kibana" # server.rewriteBasePath: true podTemplate: spec: @@ -42,16 +42,16 @@ spec: - "$(REGION)-3" containers: - name: kibana - readinessProbe: - failureThreshold: 3 - initialDelaySeconds: 10 - periodSeconds: 10 - successThreshold: 1 - exec: - command: - - /bin/bash - - -c - - curl -o /dev/null -w "%{http_code}" https://localhost:5601/kibana/login -k -s + # readinessProbe: + # failureThreshold: 3 + # initialDelaySeconds: 10 + # periodSeconds: 10 + # successThreshold: 1 + # exec: + # command: + # - /bin/bash + # - -c + # - curl -o /dev/null -w "%{http_code}" https://localhost:5601/kibana/login -k -s env: - name: xpack.encryptedSavedObjects.encryptionKey valueFrom: From 76845747f90e89c4fd1c0cec21ef54f8d0993a4a Mon Sep 17 00:00:00 2001 From: Daniel Scholl Date: Mon, 30 Sep 2024 11:28:46 -0500 Subject: [PATCH 25/26] Updated Elastic --- .../elastic-search/elastic-search.yaml | 1 - software/components/elastic-search/kibana.yaml | 17 ----------------- tools/rest-scripts/check-csv.http | 10 +++++----- tools/rest-scripts/check-file.http | 14 ++++---------- tools/rest-scripts/check-record.http | 7 ++----- 5 files changed, 11 insertions(+), 38 deletions(-) diff --git a/software/components/elastic-search/elastic-search.yaml b/software/components/elastic-search/elastic-search.yaml index d02b843a..9ae2491a 100644 --- a/software/components/elastic-search/elastic-search.yaml +++ b/software/components/elastic-search/elastic-search.yaml @@ -6,7 +6,6 @@ metadata: annotations: eck.k8s.elastic.co/downward-node-labels: "topology.kubernetes.io/zone" spec: - # version: 7.17.24 version: 8.15.2 http: tls: diff --git a/software/components/elastic-search/kibana.yaml b/software/components/elastic-search/kibana.yaml index 342a06d9..735a84bc 100644 --- a/software/components/elastic-search/kibana.yaml +++ b/software/components/elastic-search/kibana.yaml @@ -5,17 +5,10 @@ metadata: name: kibana namespace: elastic-search spec: - # version: 7.17.24 version: 8.15.2 elasticsearchRef: name: "elasticsearch" count: 3 - # config: - # server.port: 5601 - # server.publicBaseUrl: "https://localhost:5601/kibana" - # server.host: "localhost" - # server.basePath: "/kibana" - # server.rewriteBasePath: true podTemplate: spec: tolerations: @@ -42,16 +35,6 @@ spec: - "$(REGION)-3" containers: - name: kibana - # readinessProbe: - # failureThreshold: 3 - # initialDelaySeconds: 10 - # periodSeconds: 10 - # successThreshold: 1 - # exec: - # command: - # - /bin/bash - # - -c - # - curl -o /dev/null -w "%{http_code}" https://localhost:5601/kibana/login -k -s env: - name: xpack.encryptedSavedObjects.encryptionKey valueFrom: diff --git a/tools/rest-scripts/check-csv.http b/tools/rest-scripts/check-csv.http index ab1f5959..7f9c01d0 100644 --- a/tools/rest-scripts/check-csv.http +++ b/tools/rest-scripts/check-csv.http @@ -551,14 +551,14 @@ Content-Type: application/json data-partition-id: {{data_partition_id}} -@FILE_ID = {{uploadURL.response.body.FileID}} -@FILE_URL = {{uploadURL.response.body.Location.SignedURL}} -@FILE_SOURCE = {{uploadURL.response.body.Location.FileSource}} +# @FILE_ID = {{uploadURL.response.body.FileID}} +# @FILE_URL = {{uploadURL.response.body.Location.SignedURL}} +# @FILE_SOURCE = {{uploadURL.response.body.Location.FileSource}} ### # @name uploadFile -PUT {{FILE_URL}} +PUT {{uploadURL.response.body.Location.SignedURL}} x-ms-blob-type: BlockBlob < ./sample.csv @@ -601,7 +601,7 @@ data-partition-id: {{data_partition_id}} "Checksum": "string", "DatasetProperties": { "FileSourceInfo": { - "FileSource": "{{FILE_SOURCE}}", + "FileSource": "{{uploadURL.response.body.Location.FileSource}}", "Name": "sample.csv" } }, diff --git a/tools/rest-scripts/check-file.http b/tools/rest-scripts/check-file.http index 3a5c4634..b3dade2b 100644 --- a/tools/rest-scripts/check-file.http +++ b/tools/rest-scripts/check-file.http @@ -112,10 +112,6 @@ Accept: application/json Content-Type: application/json data-partition-id: {{DATA_PARTITION}} -@FILE_ID = {{uploadURL.response.body.FileID}} -@FILE_URL = {{uploadURL.response.body.Location.SignedURL}} -@FILE_SOURCE = {{uploadURL.response.body.Location.FileSource}} - ### # @name getFileList @@ -137,10 +133,10 @@ data-partition-id: {{DATA_PARTITION}} ### # @name uploadFile -PUT {{FILE_URL}} +PUT {{uploadURL.response.body.Location.SignedURL}} x-ms-blob-type: BlockBlob -< ./README.md +< ./sample.las ### @@ -181,7 +177,7 @@ data-partition-id: {{DATA_PARTITION}} "SchemaFormatTypeID": "osdu:reference-data--SchemaFormatType:LAS2:", "DatasetProperties": { "FileSourceInfo": { - "FileSource": "{{FILE_SOURCE}}", + "FileSource": "{{uploadURL.response.body.Location.FileSource}}", "Name": "sample.las" } }, @@ -212,12 +208,10 @@ Accept: application/json Content-Type: application/json data-partition-id: {{DATA_PARTITION}} -@URL = {{getDownloadUrl.response.body.SignedUrl}} - ### # @name Download -GET {{URL}} +GET {{getDownloadUrl.response.body.SignedUrl}} diff --git a/tools/rest-scripts/check-record.http b/tools/rest-scripts/check-record.http index 4912a08d..e48ee467 100644 --- a/tools/rest-scripts/check-record.http +++ b/tools/rest-scripts/check-record.http @@ -147,18 +147,15 @@ Authorization: Bearer {{access_token}} Accept: application/json data-partition-id: {{DATA_PARTITION}} -@version = {{ListRecordVersions.response.body.versions[0]}} ### # @name GetRecordVersion -GET {{STORAGE_HOST}}/records/{{id}}/{{version}} +GET {{STORAGE_HOST}}/records/{{id}}/{{ListRecordVersions.response.body.versions[0]}} Authorization: Bearer {{access_token}} Accept: application/json data-partition-id: {{DATA_PARTITION}} -@dataID = {{GetRecordVersion.response.body.data.ID}} - # ----------------------- # API search @@ -172,7 +169,7 @@ data-partition-id: {{DATA_PARTITION}} { "kind": "{{kind}}", - "query": "data.ID:(\"{{dataID}}\")", + "query": "data.ID:(\"{{GetRecordVersion.response.body.data.ID}}\")", "offset": 0, "limit": 1 } From 48d47033577c542c0e7aa923cff1d28861beca4f Mon Sep 17 00:00:00 2001 From: Daniel Scholl Date: Mon, 30 Sep 2024 11:30:44 -0500 Subject: [PATCH 26/26] Updated Elastic --- .../components/elastic-search/ingress.yaml | 33 ------------------- 1 file changed, 33 deletions(-) delete mode 100644 software/components/elastic-search/ingress.yaml diff --git a/software/components/elastic-search/ingress.yaml b/software/components/elastic-search/ingress.yaml deleted file mode 100644 index 05092598..00000000 --- a/software/components/elastic-search/ingress.yaml +++ /dev/null @@ -1,33 +0,0 @@ ---- -apiVersion: networking.istio.io/v1alpha3 -kind: DestinationRule -metadata: - name: kibana-destination - namespace: elastic-search -spec: - host: kibana-kb-http.elastic-search.svc.cluster.local - trafficPolicy: - tls: - mode: SIMPLE - insecureSkipVerify: true ---- -apiVersion: networking.istio.io/v1alpha3 -kind: VirtualService -metadata: - name: kibana - namespace: elastic-search -spec: - hosts: - - "*" - gateways: - - istio-system/internal-gateway - - istio-system/external-gateway - http: - - match: - - uri: - prefix: "/kibana" - route: - - destination: - host: "kibana-kb-http.elastic-search.svc.cluster.local" - port: - number: 5601 \ No newline at end of file