Merge pull request #567 from richm/port-json-parsing

Merged by openshift-bot

Author: OpenShift Bot

hack/testing/entrypoint.sh

@@ -95,7 +95,6 @@ fi
 
 expected_failures=(
 	"test-fluentd-forward"
-	"test-json-parsing"
 	"test-es-copy"
 	"test-mux"
 	"test-upgrade"

hack/testing/test-json-parsing.sh

@@ -1,57 +1,5 @@
-#! /bin/bash
+#!/bin/bash
 
-# test that logging will parse the message field containing
-# embedded JSON into its component fields, and use the
-# original message field in the embedded JSON
+source "$(dirname "${BASH_SOURCE[0]}" )/../lib/init.sh"
 
-if [[ $VERBOSE ]]; then
-  set -ex
-else
-  set -e
-  VERBOSE=
-fi
-set -o nounset
-set -o pipefail
-
-if ! type get_running_pod > /dev/null 2>&1 ; then
-    . ${OS_O_A_L_DIR:-../..}/deployer/scripts/util.sh
-fi
-
-ARTIFACT_DIR=${ARTIFACT_DIR:-${TMPDIR:-/tmp}/origin-aggregated-logging}
-if [ ! -d $ARTIFACT_DIR ] ; then
-    mkdir -p $ARTIFACT_DIR
-fi
-
-# generate a log message in the Kibana logs - Kibana log messages are in JSON format:
-# {"type":"response","@timestamp":"2017-04-07T02:03:37Z","tags":[],"pid":1,"method":"get","statusCode":404,"req":{"url":"/ca30cead-d470-4db8-a2a2-bb71439987e2","method":"get","headers":{"user-agent":"curl/7.29.0","host":"localhost:5601","accept":"*/*"},"remoteAddress":"127.0.0.1","userAgent":"127.0.0.1"},"res":{"statusCode":404,"responseTime":3,"contentLength":9},"message":"GET /ca30cead-d470-4db8-a2a2-bb71439987e2 404 3ms - 9.0B"}
-# logging should parse this and make "type", "tags", "statusCode", etc. as top level fields
-# the "message" field should contain only the embedded message and not the entire JSON blob
-
-es_pod=`get_running_pod es`
-uuid_es=`uuidgen`
-echo Adding test message $uuid_es to Kibana . . .
-add_test_message $uuid_es
-rc=0
-timeout=600
-echo Waiting $timeout seconds for $uuid_es to show up in Elasticsearch . . .
-if espod=$es_pod myproject=project.logging. mymessage=$uuid_es expected=1 \
-    wait_until_cmd_or_err test_count_expected test_count_err $timeout ; then
-    echo good - $0: found 1 record project logging for $uuid_es
-else
-    echo failed - $0: not found 1 record project logging for $uuid_es after $timeout seconds
-    echo "Checking journal for $uuid_es..."
-    if journalctl | grep $uuid_es ; then
-        echo "Found $uuid_es in journal"
-    else
-        echo "Unable to find $uuid_es in journal"
-    fi
-
-    exit 1
-fi
-
-echo Testing if record is in correct format . . .
-query_es_from_es $es_pod project.logging. _search message $uuid_es | \
-    python test-json-parsing.py $uuid_es
-
-echo Success: $0 passed
-exit 0
+exec ${OS_O_A_L_DIR}/test/json-parsing.sh

test/json-parsing.sh

@@ -0,0 +1,49 @@
+#!/bin/bash
+
+# test that logging will parse the message field containing
+# embedded JSON into its component fields, and use the
+# original message field in the embedded JSON
+
+source "$(dirname "${BASH_SOURCE[0]}" )/../hack/lib/init.sh"
+source "${OS_O_A_L_DIR}/deployer/scripts/util.sh"
+os::util::environment::use_sudo
+
+os::test::junit::declare_suite_start "test/json-parsing"
+
+if [ -n "${DEBUG:-}" ] ; then
+    set -x
+fi
+
+cleanup() {
+    local return_code="$?"
+    set +e
+    if [ $return_code = 0 ] ; then
+        mycmd=os::log::info
+    else
+        mycmd=os::log::error
+    fi
+    $mycmd json-parsing test finished at $( date )
+    # this will call declare_test_end, suite_end, etc.
+    os::test::junit::reconcile_output
+    exit $return_code
+}
+trap "cleanup" EXIT
+
+os::log::info Starting json-parsing test at $( date )
+
+# generate a log message in the Kibana logs - Kibana log messages are in JSON format:
+# {"type":"response","@timestamp":"2017-04-07T02:03:37Z","tags":[],"pid":1,"method":"get","statusCode":404,"req":{"url":"/ca30cead-d470-4db8-a2a2-bb71439987e2","method":"get","headers":{"user-agent":"curl/7.29.0","host":"localhost:5601","accept":"*/*"},"remoteAddress":"127.0.0.1","userAgent":"127.0.0.1"},"res":{"statusCode":404,"responseTime":3,"contentLength":9},"message":"GET /ca30cead-d470-4db8-a2a2-bb71439987e2 404 3ms - 9.0B"}
+# logging should parse this and make "type", "tags", "statusCode", etc. as top level fields
+# the "message" field should contain only the embedded message and not the entire JSON blob
+
+get_uuid_es() {
+    json_test_uuid=$1
+}
+wait_for_fluentd_ready
+wait_for_fluentd_to_catch_up get_uuid_es
+
+es_pod=$( get_running_pod es )
+
+os::log::info Testing if record is in correct format . . .
+os::cmd::expect_success "curl_es $es_pod /project.logging.*/_search?q=message:$json_test_uuid | \
+                         python $OS_O_A_L_DIR/hack/testing/test-json-parsing.py $json_test_uuid"