code cleanup

Author: steveh565

docs/DESIGN.md

@@ -2,23 +2,23 @@
 
 ## Azure Infrastructure
 
-![alt text](images/image.png)
+![alt text](image.png)
 
 ## Service Design
 
 ![alt text](image.png)
 
 ## Logical Flow: Metrics
 
-![alt text](images/image-2.png)
+![alt text](image-2.png)
 
 ## Logical Flow: Logs
 
-![alt text](images/image-3.png)
+![alt text](image-3.png)
 
 ## Logical FLow: Traces
 
-![alt text](images/image-4.png)
+![alt text](image-4.png)
 
 
 ## User Experience
@@ -27,26 +27,26 @@ The User Experience is an essential aspect of the platforms success or failure.
 
 ### Login
 
-![alt text](images/image-5.png)
+![alt text](image-5.png)
 
 ### Webtop
 
-![alt text](images/image-6.png)
+![alt text](image-6.png)
 
 ### VPN
 
-![alt text](images/image-7.png)
+![alt text](image-7.png)
 
 ### ElasticSearch
 
-![alt text](images/image-8.png)
-![alt text](images/image-9.png)
-![alt text](images/image-10.png)
-![alt text](images/image-11.png)
-![alt text](images/image-12.png)
-![alt text](images/image-13.png)
+![alt text](image-8.png)
+![alt text](image-9.png)
+![alt text](image-10.png)
+![alt text](image-11.png)
+![alt text](image-12.png)
+![alt text](image-13.png)
 
 ### GrafanaLabs
 
-![alt text](images/image-14.png)
+![alt text](image-14.png)
 

helm/CIS/crds/argocd-ingress-https-vs.yaml

@@ -22,7 +22,7 @@ spec:
   pools:
   - path: /
     service: argocd-stack-server
-    servicePort: 80
+    servicePort: 443
     reselectTries: 3
     serviceDownAction: reselect
     monitors:
@@ -31,12 +31,12 @@ spec:
        send: "HEAD / HTTP/1.0\r\n\r\n"
        timeout: 15
        type: http
-  tlsProfileName: argo-terminate-tls13
+  tlsProfileName: argo-reencrypt-tls13
 ---
 apiVersion: cis.f5.com/v1
 kind: TLSProfile
 metadata:
-  name: argo-terminate-tls13
+  name: argo-reencrypt-tls13
   namespace: argocd
   labels:
     f5cr: "true"
@@ -45,8 +45,9 @@ spec:
     tlsVersion: "1.3"
     cipherGroup: /Common/f5-default
   tls:
-    termination: edge
+    termination: reencrypt
     clientSSL: /Common/clientssl
+    serverSSL: /Common/serverssl
     reference: bigip
   hosts:
   - argocd.f5demo.com

helm/CIS/crds/kibana-ingress-https-vs.yaml

@@ -31,7 +31,7 @@ spec:
        send: "HEAD / HTTP/1.0\r\n\r\n"
        timeout: 15
        type: https
-  tlsProfileName: reencrypt-tls13
+  tlsProfileName: kibana-reencrypt-tls13
 ---
 apiVersion: cis.f5.com/v1
 kind: TLSProfile

helm/eck-stack/eck.sh

@@ -4,6 +4,18 @@
 helm repo add elastic https://helm.elastic.co
 helm repo update
 
+# install Elastic CRDs and Operator
+#helm upgrade --install elastic-operator-crds elastic/eck-operator-crds
+helm upgrade --install elastic-operator elastic/eck-operator -n elastic-system --create-namespace
+
+
+# install elasticsearch init container DaemonSet
+#kubectl apply -n elastic-system -f max-map-counter-setter.yaml
+### replaced with init-container definiton in podSpec
+
+# install ECK stack: elasticsearch-kibana-logstash-beats
+helm upgrade --install elk-stack elastic/eck-stack -n elastic-system --create-namespace --values ./values.yaml
+
 #ES Scheduler Priority settings
 cluUrl="_cluster/settings"
 cat <<-EOF >> es-priority-classes.yaml
@@ -24,17 +36,6 @@ globalDefault: false
 description: "This priority class should be used for filebeat pods only."
 EOF
 
-# install Elastic CRDs and Operator
-#helm upgrade --install elastic-operator-crds elastic/eck-operator-crds
-helm upgrade --install elastic-operator elastic/eck-operator -n elastic-system --create-namespace
-
-
-# install elasticsearch init container DaemonSet
-kubectl apply -n elastic-system -f max-map-counter-setter.yaml
-
-# install ECK stack: elasticsearch-kibana-logstash-beats
-helm upgrade --install elk-stack elastic/eck-stack -n elastic-system --create-namespace --values ./values.yaml
-
 #ES index component_template
 componentUrl="_component_template/component_template_default"
 cat <<-EOF >> component_template.json
@@ -135,16 +136,6 @@ for pod in `k describe endpoints elasticsearch-es-http -n elastic-system |grep '
     -k -X PUT -H "Content-type: application/json" https://${pod}:9200/${cluUrl} --data @./cluster.json | jq;
 ); done;
 
-# old index settings code
-#cat <<-EOF >> index.json
-#{
-#    "settings": {
-#        "index.mapping.total_fields.limit": 10000
-#    }
-#}
-#EOF
-#curl -u elastic:${esPass} -k -X PUT -H "Content-type: application/json" https://10.120.0.69:9200/logstash-hec-2024.12.04/_settings --data @./index.json
-
 # show elastic-operator logs
 echo "Username: elastic"
 echo "Password: ${esPass}"