diff options
| -rwxr-xr-x | ci/launch_docker_container.sh | 7 | ||||
| -rw-r--r-- | docker-compose/create-compose.py | 8 | ||||
| -rw-r--r-- | docker-compose/docker-compose.yaml | 2 | ||||
| -rw-r--r-- | docker/local-docker-compose.yaml | 22 | ||||
| -rw-r--r-- | docker/storperf-httpfrontend/Dockerfile | 98 | ||||
| -rw-r--r-- | docker/storperf-master/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/storperf-reporting/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/storperf-reporting/requirements.txt | 3 | ||||
| -rw-r--r-- | docker/storperf-reporting/src/app.py | 40 | ||||
| -rw-r--r-- | docker/storperf-reporting/src/templates/index.html | 7 | ||||
| -rw-r--r-- | docker/storperf-reporting/src/templates/plot_tables.html | 37 | ||||
| -rw-r--r-- | docker/storperf-swaggerui/Dockerfile | 119 | ||||
| -rw-r--r-- | docker/storperf-swaggerui/run.sh | 53 |
13 files changed, 376 insertions, 30 deletions
diff --git a/ci/launch_docker_container.sh b/ci/launch_docker_container.sh index aac5b58..47a1f17 100755 --- a/ci/launch_docker_container.sh +++ b/ci/launch_docker_container.sh @@ -22,6 +22,13 @@ then sudo chown 33:33 ${ci}/job/carbon fi +if [ -z $ARCH ] +then + ARCH=x86_64 +fi + +export ARCH + docker-compose -f local-docker-compose.yaml build docker-compose -f local-docker-compose.yaml up -d diff --git a/docker-compose/create-compose.py b/docker-compose/create-compose.py index 7f971f1..da71f69 100644 --- a/docker-compose/create-compose.py +++ b/docker-compose/create-compose.py @@ -29,7 +29,7 @@ services: storperf-swaggerui: container_name: "storperf-swaggerui" - image: "schickling/swagger-ui" + image: "opnfv/storperf-swaggerui:{swaggerui_tag}" storperf-httpfrontend: container_name: "storperf-httpfrontend" @@ -51,6 +51,9 @@ assert isinstance(reporting_tag, str) frontend_tag = input("Enter image TAG for frontend: ") or 'latest' assert isinstance(frontend_tag, str) +swaggerui_tag = input("Enter image TAG for swaggerui: ") or 'latest' +assert isinstance(swaggerui_tag, str) + env_file = input("Enter path to environment file: ") assert isinstance(env_file, str) if env_file == '': @@ -65,6 +68,7 @@ if carbon_dir == '': f = open('docker-compose.yaml', 'w') f.write(content.format(storperf_tag=storeperf_tag, reporting_tag=reporting_tag, - frontend_tag=frontend_tag, CARBON_DIR=carbon_dir, ENV_FILE=env_file)) + frontend_tag=frontend_tag, swaggerui_tag=swaggerui_tag, + CARBON_DIR=carbon_dir, ENV_FILE=env_file)) f.close() diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml index bb09eef..e9459c4 100644 --- a/docker-compose/docker-compose.yaml +++ b/docker-compose/docker-compose.yaml @@ -26,7 +26,7 @@ services: storperf-swaggerui: container_name: "storperf-swaggerui" - image: "schickling/swagger-ui" + image: "opnfv/storperf-swaggerui:${TAG}" storperf-httpfrontend: container_name: "storperf-httpfrontend" diff --git a/docker/local-docker-compose.yaml b/docker/local-docker-compose.yaml index 5520b5f..97c77ec 100644 --- a/docker/local-docker-compose.yaml +++ b/docker/local-docker-compose.yaml @@ -12,7 +12,10 @@ services: storperf-master: container_name: "storperf-master" - build: storperf-master + build: + context: storperf-master + args: + ARCH: ${ARCH} ports: - "8000:8000" env_file: ${ENV_FILE} @@ -22,19 +25,26 @@ services: storperf-reporting: container_name: "storperf-reporting" - build: storperf-reporting - ports: - - "5080:5000" + build: + context: storperf-reporting + args: + ARCH: ${ARCH} volumes: - ./storperf-reporting/:/home/opnfv/storperf-reporting storperf-swaggerui: container_name: "storperf-swaggerui" - image: "schickling/swagger-ui" + build: + context: storperf-swaggerui + args: + ARCH: ${ARCH} storperf-httpfrontend: container_name: "storperf-httpfrontend" - build: storperf-httpfrontend + build: + context: storperf-httpfrontend + args: + ARCH: ${ARCH} ports: - "5000:5000" links: diff --git a/docker/storperf-httpfrontend/Dockerfile b/docker/storperf-httpfrontend/Dockerfile index 19d620e..3b52b03 100644 --- a/docker/storperf-httpfrontend/Dockerfile +++ b/docker/storperf-httpfrontend/Dockerfile @@ -12,10 +12,101 @@ # $ docker build -t opnfv/storperf-frontend:tag . ## +ARG ARCH=x86_64 +ARG ALPINE_VERSION=v3.5 +FROM multiarch/alpine:$ARCH-$ALPINE_VERSION -FROM nginx:stable-alpine -MAINTAINER Mark Beierl <mark.beierl@dell.com> -LABEL version="3.1" description="OPNFV Storperf HTTP Front End Container" +# This comes from https://github.com/nginxinc/docker-nginx/blob/14c1b938737cf4399a6bb039bc506957dce562ae/stable/alpine/Dockerfile +# Is is cloned here so that we can use multiarch alpine + +MAINTAINER NGINX Docker Maintainers "docker-maint@nginx.com" + +ENV NGINX_VERSION 1.8.1 + +ENV GPG_KEYS B0F4253373F8F6F510D42178520A9993A1C052F8 +ENV CONFIG "\ + --prefix=/etc/nginx \ + --sbin-path=/usr/sbin/nginx \ + --conf-path=/etc/nginx/nginx.conf \ + --error-log-path=/var/log/nginx/error.log \ + --http-log-path=/var/log/nginx/access.log \ + --pid-path=/var/run/nginx.pid \ + --lock-path=/var/run/nginx.lock \ + --http-client-body-temp-path=/var/cache/nginx/client_temp \ + --http-proxy-temp-path=/var/cache/nginx/proxy_temp \ + --http-fastcgi-temp-path=/var/cache/nginx/fastcgi_temp \ + --http-uwsgi-temp-path=/var/cache/nginx/uwsgi_temp \ + --http-scgi-temp-path=/var/cache/nginx/scgi_temp \ + --user=nginx \ + --group=nginx \ + --with-http_ssl_module \ + --with-http_realip_module \ + --with-http_addition_module \ + --with-http_sub_module \ + --with-http_dav_module \ + --with-http_flv_module \ + --with-http_mp4_module \ + --with-http_gunzip_module \ + --with-http_gzip_static_module \ + --with-http_random_index_module \ + --with-http_secure_link_module \ + --with-http_stub_status_module \ + --with-http_auth_request_module \ + --with-mail \ + --with-mail_ssl_module \ + --with-file-aio \ + --with-http_spdy_module \ + --with-ipv6 \ + " + +RUN \ + addgroup -S nginx \ + && adduser -D -S -h /var/cache/nginx -s /sbin/nologin -G nginx nginx \ + && apk add --no-cache --virtual .build-deps \ + gcc \ + libc-dev \ + make \ + openssl-dev \ + pcre-dev \ + zlib-dev \ + linux-headers \ + curl \ + gnupg \ + && gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$GPG_KEYS" \ + && curl -fSL http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz -o nginx.tar.gz \ + && curl -fSL http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz.asc -o nginx.tar.gz.asc \ + && gpg --verify nginx.tar.gz.asc \ + && mkdir -p /usr/src \ + && tar -zxC /usr/src -f nginx.tar.gz \ + && rm nginx.tar.gz* \ + && rm -r /root/.gnupg \ + && cd /usr/src/nginx-$NGINX_VERSION \ + && ./configure $CONFIG --with-debug \ + && make \ + && mv objs/nginx objs/nginx-debug \ + && ./configure $CONFIG \ + && make \ + && make install \ + && install -m755 objs/nginx-debug /usr/sbin/nginx-debug \ + && strip /usr/sbin/nginx* \ + && runDeps="$( \ + scanelf --needed --nobanner /usr/sbin/nginx \ + | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ + | sort -u \ + | xargs -r apk info --installed \ + | sort -u \ + )" \ + && apk add --virtual .nginx-rundeps $runDeps \ + && apk del .build-deps \ + && rm -rf /usr/src/nginx-* \ + \ + # forward request and error logs to docker log collector + && ln -sf /dev/stdout /var/log/nginx/access.log \ + && ln -sf /dev/stderr /var/log/nginx/error.log + +EXPOSE 80 443 + +# StorPerf addition below ARG BRANCH=master @@ -23,3 +114,4 @@ COPY ./nginx.conf /etc/nginx/nginx.conf COPY ./html /etc/nginx/html EXPOSE 5000 +CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file diff --git a/docker/storperf-master/Dockerfile b/docker/storperf-master/Dockerfile index b19c12d..25eb956 100644 --- a/docker/storperf-master/Dockerfile +++ b/docker/storperf-master/Dockerfile @@ -15,7 +15,9 @@ # $ docker build -t opnfv/storperf-master:tag . # -FROM alpine:3.5 as storperf-builder +ARG ARCH=x86_64 +ARG ALPINE_VERSION=v3.6 +FROM multiarch/alpine:$ARCH-$ALPINE_VERSION as storperf-builder LABEL version="5.0" description="OPNFV Storperf Docker container" @@ -57,7 +59,7 @@ RUN pip install -r /storperf/requirements.pip # Build stripped down StorPerf image -FROM alpine:3.5 as storperf-master +FROM multiarch/alpine:$ARCH-$ALPINE_VERSION as storperf-master RUN apk --no-cache add --update \ python \ diff --git a/docker/storperf-reporting/Dockerfile b/docker/storperf-reporting/Dockerfile index bbcbdb3..ac507a6 100644 --- a/docker/storperf-reporting/Dockerfile +++ b/docker/storperf-reporting/Dockerfile @@ -15,7 +15,9 @@ ## -FROM alpine:3.1 +ARG ARCH=x86_64 +ARG ALPINE_VERSION=v3.6 +FROM multiarch/alpine:$ARCH-$ALPINE_VERSION MAINTAINER Mark Beierl <mark.beierl@dell.com> LABEL version="0.1" description="OPNFV Storperf Reporting Container" diff --git a/docker/storperf-reporting/requirements.txt b/docker/storperf-reporting/requirements.txt index 81903de..7016e72 100644 --- a/docker/storperf-reporting/requirements.txt +++ b/docker/storperf-reporting/requirements.txt @@ -1,2 +1,3 @@ Flask==0.12.2 -requests
\ No newline at end of file +requests +validators
\ No newline at end of file diff --git a/docker/storperf-reporting/src/app.py b/docker/storperf-reporting/src/app.py index c77f60f..74d1339 100644 --- a/docker/storperf-reporting/src/app.py +++ b/docker/storperf-reporting/src/app.py @@ -8,18 +8,43 @@ ############################################################################## from flask import Flask, redirect, url_for, request, render_template, session -from flask import send_from_directory +from flask import send_from_directory, flash import urllib +import validators import json app = Flask(__name__) app.secret_key = 'storperf_graphing_module' +def get_data(data): + metrics = {} + report_data = {} + temp = data.keys()[0] + if type(data[temp]) is list: + details = data[temp][0].get('details') + metrics = details.get('metrics') + report_data = details.get('report_data') + else: + metrics = data[temp].get('metrics') + report_data = data[temp].get('report_data') + return metrics, report_data + + @app.route('/reporting/success/') def success(): - data = urllib.urlopen(session["url"]).read() - data = json.loads(data) - return render_template('plot_tables.html', data=data) + try: + URL = session["url"] + if validators.url(URL): + data = urllib.urlopen(URL).read() + else: + data = open("./static/testdata/" + URL).read() + data = json.loads(data) + metrics, report_data = get_data(data) + return render_template('plot_tables.html', + metrics=metrics, report_data=report_data) + except Exception as e: + session['server_error'] = e.message + ' ' + repr(e.args) + return redirect(url_for('file_not_found')) @app.route('/reporting/url', methods=['POST', 'GET']) @@ -30,6 +55,13 @@ def url(): return redirect(url_for('success')) +@app.route('/reporting/file_not_found/') +def file_not_found(): + error = session.get('server_error') + flash("Server Error: " + error) + return redirect(url_for('index')) + + @app.route('/reporting/js/<path:path>') def js(path): return send_from_directory('static/js/', path) diff --git a/docker/storperf-reporting/src/templates/index.html b/docker/storperf-reporting/src/templates/index.html index 35cea1a..ab4e539 100644 --- a/docker/storperf-reporting/src/templates/index.html +++ b/docker/storperf-reporting/src/templates/index.html @@ -26,6 +26,13 @@ </div> </form> </div> + {% with messages = get_flashed_messages() %} {% if messages %} {% for message in messages %} + <div class="alert alert-danger alert-dismissible" role="alert"> + <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span> + </button> + {{ message }} + </div> + {% endfor %} {% endif %} {% endwith %} </div> </div> </body> diff --git a/docker/storperf-reporting/src/templates/plot_tables.html b/docker/storperf-reporting/src/templates/plot_tables.html index 04eaadc..d6eed8e 100644 --- a/docker/storperf-reporting/src/templates/plot_tables.html +++ b/docker/storperf-reporting/src/templates/plot_tables.html @@ -27,17 +27,13 @@ </center> </div> <script> - data = {{ data | tojson | safe }}; page = []; - results = data.results; - if (results == undefined) { - details = data.details; - } else { - details = results[0].details; - } - metrics = details.metrics; - report_data = details.report_data; + metrics = {{ metrics | tojson | safe }}; + report_data = {{ report_data | tojson | safe }}; + console.log(metrics); + console.log(report_data); for (var key in report_data) { + console.log(key); for (var test in report_data[key]) { var text = ""; var series = []; @@ -73,6 +69,7 @@ } } } + console.log(page); function content_display(num) { var text = page[num - 1][0]; @@ -117,7 +114,27 @@ width: 2 } }; - Plotly.newPlot(graphID, [plot, avg_plus, avg_minus]); + var layout = { + xaxis: { + title: 'ROUND', + titlefont: { + family: 'Arial, sans-serif', + size: 18, + color: 'lightgrey' + }, + showticklabels: true, + }, + yaxis: { + title: 'IOPS', + titlefont: { + family: 'Arial, sans-serif', + size: 18, + color: 'lightgrey' + }, + showticklabels: true, + } +}; + Plotly.newPlot(graphID, [plot, avg_plus, avg_minus],layout); } content_display(1); $('#page-selection').bootpag({ diff --git a/docker/storperf-swaggerui/Dockerfile b/docker/storperf-swaggerui/Dockerfile new file mode 100644 index 0000000..8904246 --- /dev/null +++ b/docker/storperf-swaggerui/Dockerfile @@ -0,0 +1,119 @@ +############################################################################## +# Copyright (c) 2017 Dell EMC and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +# Docker container for StorPerf HTTP Front ENd +# +# Build: +# $ docker build -t opnfv/storperf-swaggerui:tag . +## + +ARG ARCH=x86_64 +ARG ALPINE_VERSION=v3.6 +FROM multiarch/alpine:$ARCH-$ALPINE_VERSION + +# This is from https://github.com/nodejs/docker-node/blob/f547c4c7281027d5d90f4665815140126e1f70d5/8.2/alpine/Dockerfile + +ENV NPM_CONFIG_LOGLEVEL info +ENV NODE_VERSION 8.2.1 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + binutils-gold \ + curl \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python \ + # gpg keys listed at https://github.com/nodejs/node#release-team + && for key in \ + 9554F04D7259F04124DE6B476D5A82AC7E37093B \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + FD3A5288F042B6850C66B31F09FE44734EB7990E \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 56730D5401028683275BD23C23EFEFE93C4CFFFE \ + ; do \ + gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ + gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ + gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + done \ + && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ + && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) \ + && make install \ + && apk del .build-deps \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt + +ENV YARN_VERSION 0.27.5 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ + gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ + gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + done \ + && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ + && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt/yarn \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \ + && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ +&& apk del .build-deps-yarn + + + +# This is from https://github.com/schickling/dockerfiles/blob/master/swagger-ui/Dockerfile + +MAINTAINER Johannes Schickling "schickling.j@gmail.com" + +ENV VERSION "v2.2.10" +ENV FOLDER "swagger-ui-2.2.10" +ENV API_URL "http://petstore.swagger.io/v2/swagger.json" +ENV API_KEY "**None**" +ENV OAUTH_CLIENT_ID "**None**" +ENV OAUTH_CLIENT_SECRET "**None**" +ENV OAUTH_REALM "**None**" +ENV OAUTH_APP_NAME "**None**" +ENV OAUTH_ADDITIONAL_PARAMS "**None**" +ENV SWAGGER_JSON "/app/swagger.json" +ENV PORT 80 + +WORKDIR /app + +RUN apk add --no-cache openssl +RUN wget -qO- https://github.com/swagger-api/swagger-ui/archive/$VERSION.tar.gz | tar xvz +RUN cp -r $FOLDER/dist/* . && rm -rf $FOLDER +RUN npm config set unsafe-perm true +RUN npm install -g http-server +RUN apk del openssl + +ADD run.sh run.sh + +# webserver port +EXPOSE 80 + +CMD ["sh", "run.sh"]
\ No newline at end of file diff --git a/docker/storperf-swaggerui/run.sh b/docker/storperf-swaggerui/run.sh new file mode 100644 index 0000000..ab98585 --- /dev/null +++ b/docker/storperf-swaggerui/run.sh @@ -0,0 +1,53 @@ +#! /bin/sh +############################################################################## +# Copyright (c) 2017 Dell EMC and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +# +# From https://github.com/schickling/dockerfiles/blob/master/swagger-ui/run.sh +# +set -e + +replace_in_index () { + if [ "$1" != "**None**" ]; then + sed -i "s|/\*||g" index.html + sed -i "s|\*/||g" index.html + sed -i "s|$1|$2|g" index.html + fi +} + +replace_or_delete_in_index () { + if [ -z "$2" ]; then + sed -i "/$1/d" index.html + else + replace_in_index $1 $2 + fi +} + +replace_in_index myApiKeyXXXX123456789 $API_KEY +replace_or_delete_in_index your-client-id $OAUTH_CLIENT_ID +replace_or_delete_in_index your-client-secret-if-required $OAUTH_CLIENT_SECRET +replace_or_delete_in_index your-realms $OAUTH_REALM +replace_or_delete_in_index your-app-name $OAUTH_APP_NAME +if [ "$OAUTH_ADDITIONAL_PARAMS" != "**None**" ]; then + replace_in_index "additionalQueryStringParams: {}" "additionalQueryStringParams: {$OAUTH_ADDITIONAL_PARAMS}" +fi + +if [[ -f $SWAGGER_JSON ]]; then + sed -i "s|http://petstore.swagger.io/v2/swagger.json|swagger.json|g" index.html + sed -i "s|http://example.com/api|swagger.json|g" index.html +else + sed -i "s|http://petstore.swagger.io/v2/swagger.json|$API_URL|g" index.html + sed -i "s|http://example.com/api|$API_URL|g" index.html +fi + +if [[ -n "$VALIDATOR_URL" ]]; then + sed -i "s|.*validatorUrl:.*$||g" index.html + sed -i "s|\(url: url,.*\)|\1\n validatorUrl: \"${VALIDATOR_URL}\",|g" index.html +fi + +exec http-server -p $PORT $*
\ No newline at end of file |