Pulling in changes from master

6 files changed, 0 insertions, 169 deletions

diff --git a/roles/openshift_logging/files/curator.yml b/roles/openshift_logging/files/curator.yml
deleted file mode 100644
index 8d62d8e7d..000000000
--- a/roles/openshift_logging/files/curator.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Logging example curator config file
-
-# uncomment and use this to override the defaults from env vars
-#.defaults:
-#  delete:
-#    days: 30
-#  runhour: 0
-#  runminute: 0
-
-# to keep ops logs for a different duration:
-#.operations:
-#  delete:
-#    weeks: 8
-
-# example for a normal project
-#myapp:
-#  delete:
-#    weeks: 1
diff --git a/roles/openshift_logging/files/es_migration.sh b/roles/openshift_logging/files/es_migration.sh
deleted file mode 100644
index 339b5a1b2..000000000
--- a/roles/openshift_logging/files/es_migration.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-CA=${1:-/etc/openshift/logging/ca.crt}
-KEY=${2:-/etc/openshift/logging/system.admin.key}
-CERT=${3:-/etc/openshift/logging/system.admin.crt}
-openshift_logging_es_host=${4:-logging-es}
-openshift_logging_es_port=${5:-9200}
-namespace=${6:-logging}
-
-# for each index in _cat/indices
-# skip indices that begin with . - .kibana, .operations, etc.
-# skip indices that contain a uuid
-# get a list of unique project
-# daterx - the date regex that matches the .%Y.%m.%d at the end of the indices
-# we are interested in - the awk will strip that part off
-function get_list_of_indices() {
-    curl -s --cacert $CA --key $KEY --cert $CERT https://$openshift_logging_es_host:$openshift_logging_es_port/_cat/indices | \
-        awk -v daterx='[.]20[0-9]{2}[.][0-1]?[0-9][.][0-9]{1,2}$' \
-        '$3 !~ "^[.]" && $3 !~ "^[^.]+[.][^.]+"daterx && $3 !~ "^project." && $3 ~ daterx {print gensub(daterx, "", "", $3)}' | \
-    sort -u
-}
-
-# for each index in _cat/indices
-# skip indices that begin with . - .kibana, .operations, etc.
-# get a list of unique project.uuid
-# daterx - the date regex that matches the .%Y.%m.%d at the end of the indices
-# we are interested in - the awk will strip that part off
-function get_list_of_proj_uuid_indices() {
-    curl -s --cacert $CA --key $KEY --cert $CERT https://$openshift_logging_es_host:$openshift_logging_es_port/_cat/indices | \
-        awk -v daterx='[.]20[0-9]{2}[.][0-1]?[0-9][.][0-9]{1,2}$' \
-            '$3 !~ "^[.]" && $3 ~ "^[^.]+[.][^.]+"daterx && $3 !~ "^project." && $3 ~ daterx {print gensub(daterx, "", "", $3)}' | \
-        sort -u
-}
-
-if [[ -z "$(oc get pods -l component=es -o jsonpath='{.items[?(@.status.phase == "Running")].metadata.name}')" ]]; then
-  echo "No Elasticsearch pods found running.  Cannot update common data model."
-  exit 1
-fi
-
-count=$(get_list_of_indices | wc -l)
-if [ $count -eq 0 ]; then
-  echo No matching indices found - skipping update_for_uuid
-else
-  echo Creating aliases for $count index patterns . . .
-  {
-    echo '{"actions":['
-    get_list_of_indices | \
-      while IFS=. read proj ; do
-        # e.g. make test.uuid.* an alias of test.* so we can search for
-        # /test.uuid.*/_search and get both the test.uuid.* and
-        # the test.* indices
-        uid=$(oc get project "$proj" -o jsonpath='{.metadata.uid}' 2>/dev/null)
-        [ -n "$uid" ] && echo "{\"add\":{\"index\":\"$proj.*\",\"alias\":\"$proj.$uuid.*\"}}"
-      done
-    echo ']}'
-  } | curl -s --cacert $CA --key $KEY --cert $CERT -XPOST -d @- "https://$openshift_logging_es_host:$openshift_logging_es_port/_aliases"
-fi
-
-count=$(get_list_of_proj_uuid_indices | wc -l)
-if [ $count -eq 0 ] ; then
-    echo No matching indexes found - skipping update_for_common_data_model
-    exit 0
-fi
-
-echo Creating aliases for $count index patterns . . .
-# for each index in _cat/indices
-# skip indices that begin with . - .kibana, .operations, etc.
-# get a list of unique project.uuid
-# daterx - the date regex that matches the .%Y.%m.%d at the end of the indices
-# we are interested in - the awk will strip that part off
-{
-  echo '{"actions":['
-  get_list_of_proj_uuid_indices | \
-    while IFS=. read proj uuid ; do
-      # e.g. make project.test.uuid.* and alias of test.uuid.* so we can search for
-      # /project.test.uuid.*/_search and get both the test.uuid.* and
-      # the project.test.uuid.* indices
-      echo "{\"add\":{\"index\":\"$proj.$uuid.*\",\"alias\":\"${PROJ_PREFIX}$proj.$uuid.*\"}}"
-    done
-  echo ']}'
-} | curl -s --cacert $CA --key $KEY --cert $CERT -XPOST -d @- "https://$openshift_logging_es_host:$openshift_logging_es_port/_aliases"
diff --git a/roles/openshift_logging/files/fluent.conf b/roles/openshift_logging/files/fluent.conf
deleted file mode 100644
index aeaa705ee..000000000
--- a/roles/openshift_logging/files/fluent.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-# This file is the fluentd configuration entrypoint. Edit with care.
-
-@include configs.d/openshift/system.conf
-
-# In each section below, pre- and post- includes don't include anything initially;
-# they exist to enable future additions to openshift conf as needed.
-
-## sources
-## ordered so that syslog always runs last...
-@include configs.d/openshift/input-pre-*.conf
-@include configs.d/dynamic/input-docker-*.conf
-@include configs.d/dynamic/input-syslog-*.conf
-@include configs.d/openshift/input-post-*.conf
-##
-
-<label @INGRESS>
-## filters
-  @include configs.d/openshift/filter-pre-*.conf
-  @include configs.d/openshift/filter-retag-journal.conf
-  @include configs.d/openshift/filter-k8s-meta.conf
-  @include configs.d/openshift/filter-kibana-transform.conf
-  @include configs.d/openshift/filter-k8s-flatten-hash.conf
-  @include configs.d/openshift/filter-k8s-record-transform.conf
-  @include configs.d/openshift/filter-syslog-record-transform.conf
-  @include configs.d/openshift/filter-viaq-data-model.conf
-  @include configs.d/openshift/filter-post-*.conf
-##
-
-## matches
-  @include configs.d/openshift/output-pre-*.conf
-  @include configs.d/openshift/output-operations.conf
-  @include configs.d/openshift/output-applications.conf
-  # no post - applications.conf matches everything left
-##
-</label>
diff --git a/roles/openshift_logging/files/fluentd-throttle-config.yaml b/roles/openshift_logging/files/fluentd-throttle-config.yaml
deleted file mode 100644
index 375621ff1..000000000
--- a/roles/openshift_logging/files/fluentd-throttle-config.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Logging example fluentd throttling config file
-
-#example-project:
-#  read_lines_limit: 10
-#
-#.operations:
-#  read_lines_limit: 100
diff --git a/roles/openshift_logging/files/logging-deployer-sa.yaml b/roles/openshift_logging/files/logging-deployer-sa.yaml
deleted file mode 100644
index 334c9402b..000000000
--- a/roles/openshift_logging/files/logging-deployer-sa.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: logging-deployer
-secrets:
-- name: logging-deployer
diff --git a/roles/openshift_logging/files/secure-forward.conf b/roles/openshift_logging/files/secure-forward.conf
deleted file mode 100644
index f4483df79..000000000
--- a/roles/openshift_logging/files/secure-forward.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-# @type secure_forward
-
-# self_hostname ${HOSTNAME}
-# shared_key <SECRET_STRING>
-
-# secure yes
-# enable_strict_verification yes
-
-# ca_cert_path /etc/fluent/keys/your_ca_cert
-# ca_private_key_path /etc/fluent/keys/your_private_key
-  # for private CA secret key
-# ca_private_key_passphrase passphrase
-
-# <server>
-  # or IP
-#   host server.fqdn.example.com
-#   port 24284
-# </server>
-# <server>
-  # ip address to connect
-#   host 203.0.113.8
-  # specify hostlabel for FQDN verification if ipaddress is used for host
-#   hostlabel server.fqdn.example.com
-# </server>