From bff36d97c8e52de06350c65db55f131d59d191d8 Mon Sep 17 00:00:00 2001
From: Petr Ruzicka <petr.ruzicka@gmail.com>
Date: Thu, 21 Feb 2019 15:07:12 +0100
Subject: [PATCH] Minor fixes

---
 README.md               |   2 +-
 tests/ci_test.sh        |   4 +-
 yaml/logging-stack.yaml | 202 ----------------------------------------
 3 files changed, 3 insertions(+), 205 deletions(-)
 delete mode 100644 yaml/logging-stack.yaml

diff --git a/README.md b/README.md
index 6386e8f..1607cc6 100644
--- a/README.md
+++ b/README.md
@@ -1471,7 +1471,7 @@ sed -i "/read NAMESPACE/d" ./samples/bookinfo/platform/kube/cleanup.sh
 
     Password: `kubectl -n rook-ceph get secret rook-ceph-dashboard-password -o yaml | grep "password:" | awk '{print $2}' | base64 --decode`
 
-    Link: [https://localhost:8443/ceph-dashboard](https://localhost:8443/ceph-dashboard)
+    Link: [https://localhost:8443](https://localhost:8443)
 
 ## Links
 
diff --git a/tests/ci_test.sh b/tests/ci_test.sh
index fe861d5..d96e660 100755
--- a/tests/ci_test.sh
+++ b/tests/ci_test.sh
@@ -107,5 +107,5 @@ kubectl label namespace default istio-injection-
 cd ../..
 rm -rf files
 
-#export PROMPT_TIMEOUT=1
-#./run-k8s-istio-demo.sh
+export PROMPT_TIMEOUT=1
+./run-k8s-istio-demo.sh
diff --git a/yaml/logging-stack.yaml b/yaml/logging-stack.yaml
deleted file mode 100644
index c08d026..0000000
--- a/yaml/logging-stack.yaml
+++ /dev/null
@@ -1,202 +0,0 @@
-# Logging Namespace. All below are a part of this namespace.
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: logging
----
-# Elasticsearch Service
-apiVersion: v1
-kind: Service
-metadata:
-  name: elasticsearch
-  namespace: logging
-  labels:
-    app: elasticsearch
-spec:
-  ports:
-  - port: 9200
-    protocol: TCP
-    targetPort: db
-  selector:
-    app: elasticsearch
----
-# Elasticsearch Deployment
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: elasticsearch
-  namespace: logging
-  labels:
-    app: elasticsearch
-  annotations:
-    sidecar.istio.io/inject: "false"
-spec:
-  template:
-    metadata:
-      labels:
-        app: elasticsearch
-    spec:
-      containers:
-      - image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.1.1
-        name: elasticsearch
-        resources:
-          # need more cpu upon initialization, therefore burstable class
-          limits:
-            cpu: 1000m
-          requests:
-            cpu: 100m
-        env:
-          - name: discovery.type
-            value: single-node
-        ports:
-        - containerPort: 9200
-          name: db
-          protocol: TCP
-        - containerPort: 9300
-          name: transport
-          protocol: TCP
-        volumeMounts:
-        - name: elasticsearch
-          mountPath: /data
-      volumes:
-      - name: elasticsearch
-        emptyDir: {}
----
-# Fluentd Service
-apiVersion: v1
-kind: Service
-metadata:
-  name: fluentd-es
-  namespace: logging
-  labels:
-    app: fluentd-es
-spec:
-  ports:
-  - name: fluentd-tcp
-    port: 24224
-    protocol: TCP
-    targetPort: 24224
-  - name: fluentd-udp
-    port: 24224
-    protocol: UDP
-    targetPort: 24224
-  selector:
-    app: fluentd-es
----
-# Fluentd Deployment
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: fluentd-es
-  namespace: logging
-  labels:
-    app: fluentd-es
-  annotations:
-    sidecar.istio.io/inject: "false"
-spec:
-  template:
-    metadata:
-      labels:
-        app: fluentd-es
-    spec:
-      containers:
-      - name: fluentd-es
-        image: gcr.io/google-containers/fluentd-elasticsearch:v2.0.1
-        env:
-        - name: FLUENTD_ARGS
-          value: --no-supervisor -q
-        resources:
-          limits:
-            memory: 500Mi
-          requests:
-            cpu: 100m
-            memory: 200Mi
-        volumeMounts:
-        - name: config-volume
-          mountPath: /etc/fluent/config.d
-      terminationGracePeriodSeconds: 30
-      volumes:
-      - name: config-volume
-        configMap:
-          name: fluentd-es-config
----
-# Fluentd ConfigMap, contains config files.
-kind: ConfigMap
-apiVersion: v1
-data:
-  forward.input.conf: |-
-    # Takes the messages sent over TCP
-    <source>
-      type forward
-    </source>
-  output.conf: |-
-    <match **>
-       type elasticsearch
-       log_level info
-       include_tag_key true
-       host elasticsearch
-       port 9200
-       logstash_format true
-       # Set the chunk limits.
-       buffer_chunk_limit 2M
-       buffer_queue_limit 8
-       flush_interval 5s
-       # Never wait longer than 5 minutes between retries.
-       max_retry_wait 30
-       # Disable the limit on the number of retries (retry forever).
-       disable_retry_limit
-       # Use multiple threads for processing.
-       num_threads 2
-    </match>
-metadata:
-  name: fluentd-es-config
-  namespace: logging
----
-# Kibana Service
-apiVersion: v1
-kind: Service
-metadata:
-  name: kibana
-  namespace: logging
-  labels:
-    app: kibana
-spec:
-  ports:
-  - port: 5601
-    protocol: TCP
-    targetPort: ui
-  selector:
-    app: kibana
----
-# Kibana Deployment
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: kibana
-  namespace: logging
-  labels:
-    app: kibana
-  annotations:
-    sidecar.istio.io/inject: "false"
-spec:
-  template:
-    metadata:
-      labels:
-        app: kibana
-    spec:
-      containers:
-      - name: kibana
-        image: docker.elastic.co/kibana/kibana-oss:6.1.1
-        resources:
-          # need more cpu upon initialization, therefore burstable class
-          limits:
-            cpu: 1000m
-          requests:
-            cpu: 100m
-        env:
-          - name: ELASTICSEARCH_URL
-            value: http://elasticsearch:9200
-        ports:
-        - containerPort: 5601
-          name: ui
-          protocol: TCP