Skip to content

Commit

Permalink
Merge pull request #592 from jcantrill/vendor_origin_kibana
Browse files Browse the repository at this point in the history
Merged by openshift-bot
  • Loading branch information
OpenShift Bot committed Aug 16, 2017
2 parents 4a16045 + 3445f6f commit 7693bbf
Show file tree
Hide file tree
Showing 72 changed files with 29,679 additions and 24 deletions.
47 changes: 47 additions & 0 deletions hack/vendor-kibana-lib.sh
@@ -0,0 +1,47 @@
#!/bin/bash
#
# This script updates the vendored libraries
# added to Kibana

if [[ -n ${DEBUG:-""} ]] ; then
set -x
fi

set -o errexit
set -o nounset
set -o pipefail

function help(){
cat << TXT
This script updates the vendored libraries found in kibana/lib
use: $0 <RELEASE>
e.g: $0 v4.5.1-2
TXT
}

vendor_lib=origin-kibana
vendor_release=${1:-""}

if [ -z ${vendor_lib} ] || [ -z ${vendor_release} ] ; then
help
exit 1
fi

libdir="$(cd `dirname "${BASH_SOURCE[0]}"` && pwd)/../kibana/lib/${vendor_lib}"


DOWNLOAD_URL=${DOWNLOAD_URL:-https://github.com/openshift/origin-kibana/releases/download/${vendor_release}/origin-kibana-${vendor_release}.tgz}

rm -rf $libdir
mkdir $libdir
pushd $libdir
wget -q $DOWNLOAD_URL -O _release_
file _release_
tar -xf _release_
rm _release_
popd

10 changes: 5 additions & 5 deletions kibana/Dockerfile
Expand Up @@ -4,16 +4,15 @@ MAINTAINER OpenShift Development <dev@lists.openshift.redhat.com>

EXPOSE 5601

ENV AOP_KIBANA_PLUGIN_VER=4.5.1 \
ES_HOST=localhost \
ENV ES_HOST=localhost \
ES_PORT=9200 \
HOME=/opt/app-root/src \
KIBANA_HOME=/usr/share/kibana \
KIBANA_CONF_DIR=/etc/kibana \
CONFIG_PATH=/etc/kibana \
NODE_ENV=production \
KIBANA_VER=4.6.4 \
NODE_BIN=/opt/rh/rh-nodejs6/root/usr/bin/node \
NODE_BIN=nodescl-node \
RELEASE_STREAM=prod

LABEL io.k8s.description="Kibana container for querying Elasticsearch for aggregated logs" \
Expand All @@ -31,13 +30,14 @@ USER 0
RUN yum repolist > /dev/null && \
yum-config-manager --enable rhel-7-server-ose-3.6-rpms && \
yum-config-manager --disable epel >/dev/null || : && \
INSTALLED_PKGS="kibana-${KIBANA_VER} \
origin-kibana-${AOP_KIBANA_PLUGIN_VER}" && \
INSTALLED_PKGS="kibana-${KIBANA_VER}" && \
yum install -y --setopt=tsflags=nodocs ${INSTALLED_PKGS} && \
rpm -V ${INSTALLED_PKGS} && \
yum clean all

ADD nodescl-node /usr/bin
ADD probe/ /usr/share/kibana/probe/
ADD lib/origin-kibana ${KIBANA_HOME}/installedPlugins/origin-kibana
ADD kibana.yml ${KIBANA_CONF_DIR}/
ADD run.sh install.sh prep-install.${RELEASE_STREAM} ${HOME}/
RUN sh ${HOME}/install.sh
Expand Down
5 changes: 2 additions & 3 deletions kibana/Dockerfile.centos7
Expand Up @@ -4,9 +4,7 @@ MAINTAINER OpenShift Development <dev@lists.openshift.redhat.com>

EXPOSE 5601

ENV AOP_KIBANA_PLUGIN_REPO=https://github.com/openshift/origin-kibana \
AOP_KIBANA_PLUGIN_VER=v4.5.1-2 \
ES_HOST=localhost \
ENV ES_HOST=localhost \
ES_PORT=9200 \
HOME=/opt/app-root/src \
KIBANA_HOME=/opt/kibana \
Expand All @@ -29,6 +27,7 @@ RUN rpm --import https://packages.elastic.co/GPG-KEY-elasticsearch && \

ADD probe/ /usr/share/kibana/probe/
ADD kibana.yml ${KIBANA_CONF_DIR}/
ADD lib/origin-kibana ${KIBANA_HOME}/installedPlugins/origin-kibana
ADD run.sh install.sh prep-install.${RELEASE_STREAM} ${HOME}/
RUN ${HOME}/install.sh

Expand Down
16 changes: 13 additions & 3 deletions kibana/install.sh
Expand Up @@ -5,8 +5,7 @@ set -o nounset
set -o pipefail

chmod -R og+w "${KIBANA_CONF_DIR}"
kibana_plugin_dir=${KIBANA_HOME}/installedPlugins/origin-kibana/
mkdir -p -m 755 "${kibana_plugin_dir}"
chmod -R 755 ${KIBANA_HOME}/installedPlugins/origin-kibana

source "${HOME}/prep-install.${RELEASE_STREAM}"

Expand All @@ -19,10 +18,21 @@ touch "${KIBANA_HOME}/kibana.out"
"${NODE_BIN}" "${KIBANA_HOME}/src/cli" > "${KIBANA_HOME}/kibana.out" &
pid=$!

until [ ! -z "${pid}" ] && [ -n "$(grep 'Optimization of bundles for kibana and statusPage complete' ${KIBANA_HOME}/kibana.out)" ]; do
maxwait=$((5*60)) #5 min
slept=0
until [ ! -z "${pid}" ] && [ ${slept} -gt ${maxwait} ] ; do
if [ -n "$(grep 'Optimization of bundles for kibana and statusPage complete' ${KIBANA_HOME}/kibana.out)" ] ; then
break
fi
slept=$((slept+1))
sleep 1
done

if [ ${slept} -ge ${maxwait} ] ; then
echo "Timed out trying to optimize bundle. Dumping log and continuing..."
cat "${KIBANA_HOME}/kibana.out"
fi

if [ ! -z "${pid}" ] ; then
kill $pid
fi
Expand Down
20 changes: 20 additions & 0 deletions kibana/lib/origin-kibana/index.js
@@ -0,0 +1,20 @@
export default function (kibana) {
return new kibana.Plugin({
uiExports: {
visTypes: [
'plugins/origin-kibana/styles/main.css',
'plugins/origin-kibana/styles/overrides.css',
'plugins/origin-kibana/directives',
'plugins/origin-kibana/headerController',
'plugins/origin-kibana/userstore',
'plugins/origin-kibana/logger'
],
},

config(Joi) {
return Joi.object({
enabled: Joi.boolean().default(true),
}).default();
}
});
};
44 changes: 44 additions & 0 deletions kibana/lib/origin-kibana/package.json
@@ -0,0 +1,44 @@
{
"name": "origin-kibana",
"version": "4.5.1-2",
"homepage": "https://github.com/openshift/origin-kibana",
"authors": [
"dev@openshift.redhat.com"
],
"description": "OpenShift Origin plugin for Kibana",
"keywords": [
"openshift",
"kibana"
],
"license": "Apache-2.0",
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
],
"main": "index.js",
"scripts": {
"postinstall": "bower install"
},
"devDependencies": {
"bower": "^1.4.1",
"grunt": "~0.4.5",
"grunt-cli": "0.1.13",
"grunt-contrib-clean": "~0.7.0",
"grunt-contrib-compress": "1.3.0",
"grunt-contrib-copy": "~0.8.2",
"grunt-contrib-less": "~1.1.0",
"grunt-github-releaser": "~0.1.18",
"grunt-touch": "^1.0.0"
},
"repository": {
"type": "git",
"url": "https://github.com/openshift/origin-kibana.git"
},
"author": "Red Hat Engineering",
"bugs": {
"url": "https://github.com/openshift/origin-kibana/issues"
}
}
31 changes: 31 additions & 0 deletions kibana/lib/origin-kibana/public/directives.js
@@ -0,0 +1,31 @@
define(['require'], function(require){
const plugin = require('ui/modules').get('kibana');
plugin.directive('body', ['$compile', function($compile) {
const html = angular.element(require('./templates/header.html'));
const linkFn = $compile(html);
return {
restrict: 'E',
link: function(scope, element, attrs) {
element.prepend(linkFn(scope));
if (element.hasClass('subnav')) {
return;
}
element.addClass('navbar-pf');
element.removeClass('navbar');
element.removeClass('navbar-default');
element.find('.nav.navbar-nav').addClass('navbar-primary');
}
}
}]);
plugin.directive('subnav', function() {
return {
restrict: 'C',
link: function (scope, element, attrs) {
element.removeClass('navbar');
element.removeClass('navbar-default');
element.find('.container-fluid').removeClass('container-fluid');
element.find('.nav.navbar-nav').addClass('navbar-persistent');
}
}
});
});
Binary file not shown.
Binary file not shown.

0 comments on commit 7693bbf

Please sign in to comment.