From 68ef26a9cf159454f06fd50cf52a810906471dd5 Mon Sep 17 00:00:00 2001 From: coleramos425 Date: Thu, 9 May 2024 13:38:23 +0000 Subject: [PATCH] Move all Grafana assets into subdir. Update plugin dependencies Signed-off-by: coleramos425 [ROCm/rocprofiler-compute commit: 1f44b4faa5020085fab873f9d499f324553b1f6c] --- projects/rocprofiler-compute/.dockerignore | 8 - projects/rocprofiler-compute/Dockerfile | 67 ---- .../rocprofiler-compute/grafana/.dockerignore | 1 + .../rocprofiler-compute/grafana/Dockerfile | 75 ++++ .../dashboards/Omniperf_v1.0.3_pub.json | 0 .../dashboards/Omniperf_v1.0.5_pub.json | 0 .../dashboards/Omniperf_v1.0.7_pub.json | 0 .../dashboards/Omniperf_v1.0.8_pub.json | 0 .../dashboards/Omniperf_v2.0.0_pub.json | 0 .../{ => grafana}/docker-compose.yml | 4 + .../{docker => grafana}/docker-entrypoint.sh | 2 +- .../{docker => grafana}/grafana.ini | 2 +- .../plugins/omniperf_plugin}/.gitignore | 2 +- .../plugins/omniperf_plugin}/.jscs.json | 0 .../plugins/omniperf_plugin}/.prettierrc | 0 .../plugins/omniperf_plugin}/CHANGELOG.md | 0 .../plugins/omniperf_plugin/Gruntfile.js | 88 +++++ .../plugins/omniperf_plugin}/LICENSE | 0 .../plugins/omniperf_plugin}/README.md | 0 .../plugins/omniperf_plugin/package.json | 43 +++ .../server/config/default.json | 0 .../omniperf_plugin}/server/mongo-proxy.js | 0 .../server/mongodb-grafana-proxy.plist | 0 .../omniperf_plugin}/src/css/query-editor.css | 0 .../omniperf_plugin}/src/datasource.js | 0 .../src/html/annotations.editor.html | 0 .../omniperf_plugin}/src/html/config.html | 0 .../src/html/query.editor.html | 0 .../src/html/query.options.html | 0 .../src/img/omniperf_circle.png | Bin .../omniperf_plugin}/src/img/sample.PNG | Bin .../plugins/omniperf_plugin}/src/module.js | 0 .../plugins/omniperf_plugin}/src/plugin.json | 0 .../omniperf_plugin}/src/query_ctrl.js | 0 .../omniperfData_plugin/gulpfile.js | 22 -- .../omniperfData_plugin/package.json | 37 -- .../svg_plugin/.config/.eslintrc | 13 - .../svg_plugin/.config/.prettierrc.js | 16 - .../svg_plugin/.config/Dockerfile | 16 - .../svg_plugin/.config/README.md | 164 -------- .../svg_plugin/.config/jest-setup.js | 25 -- .../svg_plugin/.config/jest.config.js | 43 --- .../.config/jest/mocks/react-inlinesvg.tsx | 25 -- .../svg_plugin/.config/jest/utils.js | 31 -- .../svg_plugin/.config/tsconfig.json | 26 -- .../svg_plugin/.config/types/custom.d.ts | 37 -- .../svg_plugin/.config/webpack/constants.ts | 2 - .../svg_plugin/.config/webpack/utils.ts | 40 -- .../.config/webpack/webpack.config.ts | 201 ---------- .../grafana_plugins/svg_plugin/.eslintrc | 3 - .../grafana_plugins/svg_plugin/.gitignore | 30 -- .../grafana_plugins/svg_plugin/.nvmrc | 1 - .../grafana_plugins/svg_plugin/.prettierrc.js | 4 - .../grafana_plugins/svg_plugin/CHANGELOG.md | 5 - .../grafana_plugins/svg_plugin/LICENSE | 21 -- .../grafana_plugins/svg_plugin/README.md | 44 --- .../svg_plugin/docker-compose.yaml | 15 - .../grafana_plugins/svg_plugin/jest-setup.js | 2 - .../grafana_plugins/svg_plugin/jest.config.js | 8 - .../grafana_plugins/svg_plugin/package.json | 74 ---- .../svg_plugin/src/SVGjsPanel.tsx | 309 ---------------- .../svg_plugin/src/SimplePanel.tsx | 90 ----- .../svg_plugin/src/examples.ts | 61 --- .../svg_plugin/src/img/logo.svg | 1 - .../grafana_plugins/svg_plugin/src/module.ts | 28 -- .../svg_plugin/src/options.tsx | 349 ------------------ .../svg_plugin/src/plugin.json | 25 -- .../grafana_plugins/svg_plugin/src/types.ts | 50 --- .../grafana_plugins/svg_plugin/tsconfig.json | 3 - 69 files changed, 214 insertions(+), 1899 deletions(-) delete mode 100644 projects/rocprofiler-compute/.dockerignore delete mode 100644 projects/rocprofiler-compute/Dockerfile create mode 100644 projects/rocprofiler-compute/grafana/.dockerignore create mode 100644 projects/rocprofiler-compute/grafana/Dockerfile rename projects/rocprofiler-compute/{ => grafana}/dashboards/Omniperf_v1.0.3_pub.json (100%) rename projects/rocprofiler-compute/{ => grafana}/dashboards/Omniperf_v1.0.5_pub.json (100%) rename projects/rocprofiler-compute/{ => grafana}/dashboards/Omniperf_v1.0.7_pub.json (100%) rename projects/rocprofiler-compute/{ => grafana}/dashboards/Omniperf_v1.0.8_pub.json (100%) rename projects/rocprofiler-compute/{ => grafana}/dashboards/Omniperf_v2.0.0_pub.json (100%) rename projects/rocprofiler-compute/{ => grafana}/docker-compose.yml (83%) rename projects/rocprofiler-compute/{docker => grafana}/docker-entrypoint.sh (96%) mode change 100755 => 100644 rename projects/rocprofiler-compute/{docker => grafana}/grafana.ini (99%) rename projects/rocprofiler-compute/{grafana_plugins/omniperfData_plugin => grafana/plugins/omniperf_plugin}/.gitignore (95%) rename projects/rocprofiler-compute/{grafana_plugins/omniperfData_plugin => grafana/plugins/omniperf_plugin}/.jscs.json (100%) rename projects/rocprofiler-compute/{grafana_plugins/omniperfData_plugin => grafana/plugins/omniperf_plugin}/.prettierrc (100%) rename projects/rocprofiler-compute/{grafana_plugins/omniperfData_plugin => grafana/plugins/omniperf_plugin}/CHANGELOG.md (100%) create mode 100644 projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/Gruntfile.js rename projects/rocprofiler-compute/{grafana_plugins/omniperfData_plugin => grafana/plugins/omniperf_plugin}/LICENSE (100%) rename projects/rocprofiler-compute/{grafana_plugins/omniperfData_plugin => grafana/plugins/omniperf_plugin}/README.md (100%) create mode 100644 projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/package.json rename projects/rocprofiler-compute/{grafana_plugins/omniperfData_plugin => grafana/plugins/omniperf_plugin}/server/config/default.json (100%) rename projects/rocprofiler-compute/{grafana_plugins/omniperfData_plugin => grafana/plugins/omniperf_plugin}/server/mongo-proxy.js (100%) rename projects/rocprofiler-compute/{grafana_plugins/omniperfData_plugin => grafana/plugins/omniperf_plugin}/server/mongodb-grafana-proxy.plist (100%) rename projects/rocprofiler-compute/{grafana_plugins/omniperfData_plugin => grafana/plugins/omniperf_plugin}/src/css/query-editor.css (100%) rename projects/rocprofiler-compute/{grafana_plugins/omniperfData_plugin => grafana/plugins/omniperf_plugin}/src/datasource.js (100%) rename projects/rocprofiler-compute/{grafana_plugins/omniperfData_plugin => grafana/plugins/omniperf_plugin}/src/html/annotations.editor.html (100%) rename projects/rocprofiler-compute/{grafana_plugins/omniperfData_plugin => grafana/plugins/omniperf_plugin}/src/html/config.html (100%) rename projects/rocprofiler-compute/{grafana_plugins/omniperfData_plugin => grafana/plugins/omniperf_plugin}/src/html/query.editor.html (100%) rename projects/rocprofiler-compute/{grafana_plugins/omniperfData_plugin => grafana/plugins/omniperf_plugin}/src/html/query.options.html (100%) rename projects/rocprofiler-compute/{grafana_plugins/omniperfData_plugin => grafana/plugins/omniperf_plugin}/src/img/omniperf_circle.png (100%) rename projects/rocprofiler-compute/{grafana_plugins/omniperfData_plugin => grafana/plugins/omniperf_plugin}/src/img/sample.PNG (100%) rename projects/rocprofiler-compute/{grafana_plugins/omniperfData_plugin => grafana/plugins/omniperf_plugin}/src/module.js (100%) rename projects/rocprofiler-compute/{grafana_plugins/omniperfData_plugin => grafana/plugins/omniperf_plugin}/src/plugin.json (100%) rename projects/rocprofiler-compute/{grafana_plugins/omniperfData_plugin => grafana/plugins/omniperf_plugin}/src/query_ctrl.js (100%) delete mode 100644 projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/gulpfile.js delete mode 100644 projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/package.json delete mode 100644 projects/rocprofiler-compute/grafana_plugins/svg_plugin/.config/.eslintrc delete mode 100644 projects/rocprofiler-compute/grafana_plugins/svg_plugin/.config/.prettierrc.js delete mode 100644 projects/rocprofiler-compute/grafana_plugins/svg_plugin/.config/Dockerfile delete mode 100644 projects/rocprofiler-compute/grafana_plugins/svg_plugin/.config/README.md delete mode 100644 projects/rocprofiler-compute/grafana_plugins/svg_plugin/.config/jest-setup.js delete mode 100644 projects/rocprofiler-compute/grafana_plugins/svg_plugin/.config/jest.config.js delete mode 100644 projects/rocprofiler-compute/grafana_plugins/svg_plugin/.config/jest/mocks/react-inlinesvg.tsx delete mode 100644 projects/rocprofiler-compute/grafana_plugins/svg_plugin/.config/jest/utils.js delete mode 100644 projects/rocprofiler-compute/grafana_plugins/svg_plugin/.config/tsconfig.json delete mode 100644 projects/rocprofiler-compute/grafana_plugins/svg_plugin/.config/types/custom.d.ts delete mode 100644 projects/rocprofiler-compute/grafana_plugins/svg_plugin/.config/webpack/constants.ts delete mode 100644 projects/rocprofiler-compute/grafana_plugins/svg_plugin/.config/webpack/utils.ts delete mode 100644 projects/rocprofiler-compute/grafana_plugins/svg_plugin/.config/webpack/webpack.config.ts delete mode 100644 projects/rocprofiler-compute/grafana_plugins/svg_plugin/.eslintrc delete mode 100644 projects/rocprofiler-compute/grafana_plugins/svg_plugin/.gitignore delete mode 100644 projects/rocprofiler-compute/grafana_plugins/svg_plugin/.nvmrc delete mode 100644 projects/rocprofiler-compute/grafana_plugins/svg_plugin/.prettierrc.js delete mode 100644 projects/rocprofiler-compute/grafana_plugins/svg_plugin/CHANGELOG.md delete mode 100644 projects/rocprofiler-compute/grafana_plugins/svg_plugin/LICENSE delete mode 100644 projects/rocprofiler-compute/grafana_plugins/svg_plugin/README.md delete mode 100644 projects/rocprofiler-compute/grafana_plugins/svg_plugin/docker-compose.yaml delete mode 100644 projects/rocprofiler-compute/grafana_plugins/svg_plugin/jest-setup.js delete mode 100644 projects/rocprofiler-compute/grafana_plugins/svg_plugin/jest.config.js delete mode 100644 projects/rocprofiler-compute/grafana_plugins/svg_plugin/package.json delete mode 100644 projects/rocprofiler-compute/grafana_plugins/svg_plugin/src/SVGjsPanel.tsx delete mode 100644 projects/rocprofiler-compute/grafana_plugins/svg_plugin/src/SimplePanel.tsx delete mode 100644 projects/rocprofiler-compute/grafana_plugins/svg_plugin/src/examples.ts delete mode 100644 projects/rocprofiler-compute/grafana_plugins/svg_plugin/src/img/logo.svg delete mode 100644 projects/rocprofiler-compute/grafana_plugins/svg_plugin/src/module.ts delete mode 100644 projects/rocprofiler-compute/grafana_plugins/svg_plugin/src/options.tsx delete mode 100644 projects/rocprofiler-compute/grafana_plugins/svg_plugin/src/plugin.json delete mode 100644 projects/rocprofiler-compute/grafana_plugins/svg_plugin/src/types.ts delete mode 100644 projects/rocprofiler-compute/grafana_plugins/svg_plugin/tsconfig.json diff --git a/projects/rocprofiler-compute/.dockerignore b/projects/rocprofiler-compute/.dockerignore deleted file mode 100644 index eac136f33d..0000000000 --- a/projects/rocprofiler-compute/.dockerignore +++ /dev/null @@ -1,8 +0,0 @@ -/dashboards -/mongodb_connector -/perfmon -/sample -/soc_params -/utils -/wave_parser -/TestArea \ No newline at end of file diff --git a/projects/rocprofiler-compute/Dockerfile b/projects/rocprofiler-compute/Dockerfile deleted file mode 100644 index 80990a202e..0000000000 --- a/projects/rocprofiler-compute/Dockerfile +++ /dev/null @@ -1,67 +0,0 @@ -# ----------------------------------------------------------------------- -# NOTE: -# Dependencies are not included as part of Omniperf. -# It's the user's responsibility to accept any licensing implications -# before building the project -# ----------------------------------------------------------------------- - -FROM ubuntu:20.04 -WORKDIR /app - -USER root - -ENV DEBIAN_FRONTEND noninteractive -ENV TZ "US/Chicago" - -ADD grafana_plugins/svg_plugin /var/lib/grafana/plugins/custom-svg -ADD grafana_plugins/omniperfData_plugin /var/lib/grafana/plugins/omniperfData_plugin - -RUN apt-get update && \ - apt-get install -y apt-transport-https software-properties-common adduser libfontconfig1 wget curl && \ - wget https://dl.grafana.com/enterprise/release/grafana-enterprise_8.3.4_amd64.deb &&\ - dpkg -i grafana-enterprise_8.3.4_amd64.deb &&\ - echo "deb https://packages.grafana.com/enterprise/deb stable main" | tee -a /etc/apt/sources.list.d/grafana.list && \ - echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" | tee /etc/apt/sources.list.d/yarn.list && \ - apt-get install gnupg && \ - wget -qO - https://www.mongodb.org/static/pgp/server-5.0.asc -O server-5.0.asc &&\ - apt-key add server-5.0.asc && \ - echo "deb [trusted=yes arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/5.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org.list && \ - wget -q -O - https://packages.grafana.com/gpg.key | apt-key add - && \ - curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /usr/share/keyrings/yarnkey.gpg > /dev/null && \ - apt-get update && \ - apt-get install -y mongodb-org && \ - apt-get install -y tzdata systemd apt-utils npm vim net-tools && \ - mkdir -p /nonexistent && \ - /usr/sbin/grafana-cli plugins install michaeldmoore-multistat-panel && \ - /usr/sbin/grafana-cli plugins install ae3e-plotly-panel && \ - /usr/sbin/grafana-cli plugins install natel-plotly-panel && \ - /usr/sbin/grafana-cli plugins install grafana-image-renderer && \ - curl -fsSL https://deb.nodesource.com/setup_16.x | bash - && \ - apt-get install -y yarn nodejs && \ - chown root:grafana /etc/grafana && \ - cd /var/lib/grafana/plugins/omniperfData_plugin && \ - npm install && \ - npm run build && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ - cd /var/lib/grafana/plugins/custom-svg && \ - yarn install && \ - yarn build && \ - yarn autoclean && \ - sed -i "s/ bindIp.*/ bindIp: 0.0.0.0/" /etc/mongod.conf && \ - mkdir -p /var/lib/grafana && \ - touch /var/lib/grafana/grafana.lib && \ - chown grafana:grafana /var/lib/grafana/grafana.lib && \ - rm /app/grafana-enterprise_8.3.4_amd64.deb /app/server-5.0.asc - -# Overwrite grafana ini file -COPY docker/grafana.ini /etc/grafana - -# switch Grafana port to 4000 -RUN sed -i "s/^;http_port = 3000/http_port = 4000/" /etc/grafana/grafana.ini && \ - sed -i "s/^http_port = 3000/http_port = 4000/" /usr/share/grafana/conf/defaults.ini - -# starts mongo and grafana-server at startup -COPY docker/docker-entrypoint.sh /docker-entrypoint.sh - -ENTRYPOINT [ "/docker-entrypoint.sh" ] \ No newline at end of file diff --git a/projects/rocprofiler-compute/grafana/.dockerignore b/projects/rocprofiler-compute/grafana/.dockerignore new file mode 100644 index 0000000000..779e94797f --- /dev/null +++ b/projects/rocprofiler-compute/grafana/.dockerignore @@ -0,0 +1 @@ +/dashboards \ No newline at end of file diff --git a/projects/rocprofiler-compute/grafana/Dockerfile b/projects/rocprofiler-compute/grafana/Dockerfile new file mode 100644 index 0000000000..1d08e1753f --- /dev/null +++ b/projects/rocprofiler-compute/grafana/Dockerfile @@ -0,0 +1,75 @@ +# ----------------------------------------------------------------------- +# NOTE: +# Dependencies are not included as part of Omniperf. +# It's the user's responsibility to accept any licensing implications +# before building the project +# ----------------------------------------------------------------------- + +FROM ubuntu:22.04 +WORKDIR /app + +USER root + +ENV DEBIAN_FRONTEND noninteractive +ENV TZ "US/Chicago" +ENV NVM_DIR /usr/local/nvm +ENV NODE_VERSION 20.12.2 + +ADD plugins/omniperf_plugin /var/lib/grafana/plugins/omniperf_plugin + +# Install Grafana and MongoDB Community Edition +RUN apt-get update && \ + apt-get install -y apt-transport-https software-properties-common wget && \ + mkdir -p /etc/apt/keyrings/ && \ + wget -q -O - https://apt.grafana.com/gpg.key | gpg --dearmor | tee /etc/apt/keyrings/grafana.gpg > /dev/null && \ + echo "deb [signed-by=/etc/apt/keyrings/grafana.gpg] https://apt.grafana.com stable main" | tee -a /etc/apt/sources.list.d/grafana.list && \ + apt-get update && \ + apt-get install -y grafana && \ + apt-get install -y gnupg curl && \ + curl -fsSL https://www.mongodb.org/static/pgp/server-7.0.asc | gpg -o /usr/share/keyrings/mongodb-server-7.0.gpg --dearmor && \ + echo "deb [ arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-server-7.0.gpg ] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/7.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-7.0.list && \ + apt-get update && \ + apt-get install -y mongodb-org + +RUN mkdir /usr/local/nvm && \ + curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash && \ + . $NVM_DIR/nvm.sh && \ + nvm install $NODE_VERSION && \ + nvm alias default $NODE_VERSION && \ + nvm use default + +ENV NODE_PATH $NVM_DIR/v$NODE_VERSION/lib/node_modules +ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH + +RUN npm --version && \ + node --version + +# Install Grafana plugins +RUN apt-get install -y tzdata systemd apt-utils npm vim net-tools && \ + /usr/sbin/grafana-cli plugins install michaeldmoore-multistat-panel && \ + /usr/sbin/grafana-cli plugins install ae3e-plotly-panel && \ + /usr/sbin/grafana-cli plugins install natel-plotly-panel && \ + /usr/sbin/grafana-cli plugins install grafana-image-renderer && \ + /usr/sbin/grafana-cli plugins install aceiot-svg-panel && \ + chown root:grafana /etc/grafana && \ + cd /var/lib/grafana/plugins/omniperf_plugin && \ + npm install && \ + npm run build && \ + apt-get autoremove -y && \ + apt-get autoclean -y && \ + sed -i "s/ bindIp.*/ bindIp: 0.0.0.0/" /etc/mongod.conf && \ + mkdir -p /var/lib/grafana && \ + touch /var/lib/grafana/grafana.lib && \ + chown grafana:grafana /var/lib/grafana/grafana.lib + +# Overwrite grafana ini file +COPY grafana.ini /etc/grafana + +# Switch Grafana port to 4000 +RUN sed -i "s/^;http_port = 3000/http_port = 4000/" /etc/grafana/grafana.ini && \ + sed -i "s/^http_port = 3000/http_port = 4000/" /usr/share/grafana/conf/defaults.ini + +# Starts mongo and grafana-server at startup +COPY docker-entrypoint.sh /docker-entrypoint.sh + +ENTRYPOINT [ "/docker-entrypoint.sh" ] diff --git a/projects/rocprofiler-compute/dashboards/Omniperf_v1.0.3_pub.json b/projects/rocprofiler-compute/grafana/dashboards/Omniperf_v1.0.3_pub.json similarity index 100% rename from projects/rocprofiler-compute/dashboards/Omniperf_v1.0.3_pub.json rename to projects/rocprofiler-compute/grafana/dashboards/Omniperf_v1.0.3_pub.json diff --git a/projects/rocprofiler-compute/dashboards/Omniperf_v1.0.5_pub.json b/projects/rocprofiler-compute/grafana/dashboards/Omniperf_v1.0.5_pub.json similarity index 100% rename from projects/rocprofiler-compute/dashboards/Omniperf_v1.0.5_pub.json rename to projects/rocprofiler-compute/grafana/dashboards/Omniperf_v1.0.5_pub.json diff --git a/projects/rocprofiler-compute/dashboards/Omniperf_v1.0.7_pub.json b/projects/rocprofiler-compute/grafana/dashboards/Omniperf_v1.0.7_pub.json similarity index 100% rename from projects/rocprofiler-compute/dashboards/Omniperf_v1.0.7_pub.json rename to projects/rocprofiler-compute/grafana/dashboards/Omniperf_v1.0.7_pub.json diff --git a/projects/rocprofiler-compute/dashboards/Omniperf_v1.0.8_pub.json b/projects/rocprofiler-compute/grafana/dashboards/Omniperf_v1.0.8_pub.json similarity index 100% rename from projects/rocprofiler-compute/dashboards/Omniperf_v1.0.8_pub.json rename to projects/rocprofiler-compute/grafana/dashboards/Omniperf_v1.0.8_pub.json diff --git a/projects/rocprofiler-compute/dashboards/Omniperf_v2.0.0_pub.json b/projects/rocprofiler-compute/grafana/dashboards/Omniperf_v2.0.0_pub.json similarity index 100% rename from projects/rocprofiler-compute/dashboards/Omniperf_v2.0.0_pub.json rename to projects/rocprofiler-compute/grafana/dashboards/Omniperf_v2.0.0_pub.json diff --git a/projects/rocprofiler-compute/docker-compose.yml b/projects/rocprofiler-compute/grafana/docker-compose.yml similarity index 83% rename from projects/rocprofiler-compute/docker-compose.yml rename to projects/rocprofiler-compute/grafana/docker-compose.yml index 35db4b3add..34e03d277b 100644 --- a/projects/rocprofiler-compute/docker-compose.yml +++ b/projects/rocprofiler-compute/grafana/docker-compose.yml @@ -13,6 +13,10 @@ services: container_name: omniperf-grafana-v1.0 restart: always build: . + environment: + - GF_PATHS_CONFIG="grafana/etc/grafana.ini" + - GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS=amd-omniperf-data-plugin + - GF_DEFAULT_APP_MODE=development ports: - "14000:4000" volumes: diff --git a/projects/rocprofiler-compute/docker/docker-entrypoint.sh b/projects/rocprofiler-compute/grafana/docker-entrypoint.sh old mode 100755 new mode 100644 similarity index 96% rename from projects/rocprofiler-compute/docker/docker-entrypoint.sh rename to projects/rocprofiler-compute/grafana/docker-entrypoint.sh index 9cf59ace69..57ae8fa749 --- a/projects/rocprofiler-compute/docker/docker-entrypoint.sh +++ b/projects/rocprofiler-compute/grafana/docker-entrypoint.sh @@ -24,7 +24,7 @@ # SOFTWARE. ##############################################################################el -pushd /var/lib/grafana/plugins/omniperfData_plugin +pushd /var/lib/grafana/plugins/omniperf_plugin npm run server & popd diff --git a/projects/rocprofiler-compute/docker/grafana.ini b/projects/rocprofiler-compute/grafana/grafana.ini similarity index 99% rename from projects/rocprofiler-compute/docker/grafana.ini rename to projects/rocprofiler-compute/grafana/grafana.ini index b4cffeb0bd..fcf8b42b05 100644 --- a/projects/rocprofiler-compute/docker/grafana.ini +++ b/projects/rocprofiler-compute/grafana/grafana.ini @@ -4,7 +4,7 @@ # change # possible values : production, development -;app_mode = production +app_mode = development # instance name, defaults to HOSTNAME environment variable value or hostname if HOSTNAME var is empty ;instance_name = ${HOSTNAME} diff --git a/projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/.gitignore b/projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/.gitignore similarity index 95% rename from projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/.gitignore rename to projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/.gitignore index 423b8d3458..c5c75fd269 100644 --- a/projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/.gitignore +++ b/projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/.gitignore @@ -4,4 +4,4 @@ jspm_packages/ # Nuxt.js build / generate output .nuxt -dist \ No newline at end of file +dist diff --git a/projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/.jscs.json b/projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/.jscs.json similarity index 100% rename from projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/.jscs.json rename to projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/.jscs.json diff --git a/projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/.prettierrc b/projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/.prettierrc similarity index 100% rename from projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/.prettierrc rename to projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/.prettierrc diff --git a/projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/CHANGELOG.md b/projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/CHANGELOG.md similarity index 100% rename from projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/CHANGELOG.md rename to projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/CHANGELOG.md diff --git a/projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/Gruntfile.js b/projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/Gruntfile.js new file mode 100644 index 0000000000..2c47231157 --- /dev/null +++ b/projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/Gruntfile.js @@ -0,0 +1,88 @@ +module.exports = function(grunt) { + + require('load-grunt-tasks')(grunt); + + grunt.loadNpmTasks('grunt-execute'); + grunt.loadNpmTasks('grunt-contrib-clean'); + + grunt.initConfig({ + + clean: ["dist"], + + copy: { + src_to_dist: { + cwd: 'src', + expand: true, + src: ['**/*', '!**/*.js', '!**/*.scss'], + dest: 'dist' + }, + server_to_dist: { + cwd: 'server', + expand: true, + src: ['**/*'], + dest: 'dist/server' + }, + pluginDef: { + expand: true, + src: ['README.md'], + dest: 'dist' + } + }, + + watch: { + rebuild_all: { + files: ['src/**/*'], + tasks: ['default'], + options: {spawn: false} + } + }, + + babel: { + options: { + sourceMap: true, + presets: ['@babel/preset-env'] + }, + dist: { + // options: { + // plugins: ['transform-es2015-modules-systemjs', 'transform-es2015-for-of'] + // }, + files: [{ + cwd: 'src', + expand: true, + src: ['**/*.js'], + dest: 'dist', + ext:'.js' + }] + }, + distTestNoSystemJs: { + files: [{ + cwd: 'src', + expand: true, + src: ['**/*.js'], + dest: 'dist/test', + ext:'.js' + }] + }, + distTestsSpecsNoSystemJs: { + files: [{ + expand: true, + cwd: 'spec', + src: ['**/*.js'], + dest: 'dist/test/spec', + ext:'.js' + }] + } + }, + + mochaTest: { + test: { + options: { + reporter: 'spec' + }, + src: ['dist/test/spec/test-main.js', 'dist/test/spec/*_spec.js'] + } + } + }); + + grunt.registerTask('default', ['clean', 'copy:src_to_dist', 'copy:server_to_dist', 'copy:pluginDef', 'babel', 'mochaTest']); + }; \ No newline at end of file diff --git a/projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/LICENSE b/projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/LICENSE similarity index 100% rename from projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/LICENSE rename to projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/LICENSE diff --git a/projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/README.md b/projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/README.md similarity index 100% rename from projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/README.md rename to projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/README.md diff --git a/projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/package.json b/projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/package.json new file mode 100644 index 0000000000..36c6c420f7 --- /dev/null +++ b/projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/package.json @@ -0,0 +1,43 @@ +{ + "name": "amd-omniperf-data-plugin", + "version": "1.0.0", + "description": "", + "main": "server/mongo-proxy.js", + "scripts": { + "build": "./node_modules/grunt-cli/bin/grunt", + "test": "./node_modules/grunt-cli/bin/grunt mochaTest'", + "server": "cd server && node mongo-proxy.js" + }, + "author": "Audacious Software Group", + "license": "MIT", + "devDependencies": { + "@babel/preset-env": "^7.24.5", + "babel": "^6.23.0", + "chai": "^4.3.6", + "grunt": "^1.6.1", + "grunt-babel": "^8.0.0", + "grunt-cli": "^1.4.3", + "grunt-contrib-clean": "^1.1.0", + "grunt-contrib-copy": "^1.0.0", + "grunt-contrib-uglify": "^5.2.1", + "grunt-contrib-watch": "^1.1.0", + "grunt-mocha-test": "^0.13.3", + "jsdom": "^20.0.0", + "liftoff": "^5.0.0", + "load-grunt-tasks": "^3.5.2", + "prunk": "^1.3.0", + "q": "^1.5.0" + }, + "dependencies": { + "body-parser": "^1.18.3", + "config": "^1.30.0", + "express": "^4.17.3", + "fs": "0.0.1-security", + "lodash": "^4.17.21", + "mocha": "^10.4.0", + "moment": "^2.29.4", + "mongodb": "^4.12.1", + "statman-stopwatch": "^2.7.0" + }, + "_comments": "Dependencies are not included as part of Omniperf. It's the user's responsibility to accept any licensing implications before building the project." +} diff --git a/projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/server/config/default.json b/projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/server/config/default.json similarity index 100% rename from projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/server/config/default.json rename to projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/server/config/default.json diff --git a/projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/server/mongo-proxy.js b/projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/server/mongo-proxy.js similarity index 100% rename from projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/server/mongo-proxy.js rename to projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/server/mongo-proxy.js diff --git a/projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/server/mongodb-grafana-proxy.plist b/projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/server/mongodb-grafana-proxy.plist similarity index 100% rename from projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/server/mongodb-grafana-proxy.plist rename to projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/server/mongodb-grafana-proxy.plist diff --git a/projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/src/css/query-editor.css b/projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/src/css/query-editor.css similarity index 100% rename from projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/src/css/query-editor.css rename to projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/src/css/query-editor.css diff --git a/projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/src/datasource.js b/projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/src/datasource.js similarity index 100% rename from projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/src/datasource.js rename to projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/src/datasource.js diff --git a/projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/src/html/annotations.editor.html b/projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/src/html/annotations.editor.html similarity index 100% rename from projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/src/html/annotations.editor.html rename to projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/src/html/annotations.editor.html diff --git a/projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/src/html/config.html b/projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/src/html/config.html similarity index 100% rename from projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/src/html/config.html rename to projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/src/html/config.html diff --git a/projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/src/html/query.editor.html b/projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/src/html/query.editor.html similarity index 100% rename from projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/src/html/query.editor.html rename to projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/src/html/query.editor.html diff --git a/projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/src/html/query.options.html b/projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/src/html/query.options.html similarity index 100% rename from projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/src/html/query.options.html rename to projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/src/html/query.options.html diff --git a/projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/src/img/omniperf_circle.png b/projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/src/img/omniperf_circle.png similarity index 100% rename from projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/src/img/omniperf_circle.png rename to projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/src/img/omniperf_circle.png diff --git a/projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/src/img/sample.PNG b/projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/src/img/sample.PNG similarity index 100% rename from projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/src/img/sample.PNG rename to projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/src/img/sample.PNG diff --git a/projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/src/module.js b/projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/src/module.js similarity index 100% rename from projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/src/module.js rename to projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/src/module.js diff --git a/projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/src/plugin.json b/projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/src/plugin.json similarity index 100% rename from projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/src/plugin.json rename to projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/src/plugin.json diff --git a/projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/src/query_ctrl.js b/projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/src/query_ctrl.js similarity index 100% rename from projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/src/query_ctrl.js rename to projects/rocprofiler-compute/grafana/plugins/omniperf_plugin/src/query_ctrl.js diff --git a/projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/gulpfile.js b/projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/gulpfile.js deleted file mode 100644 index aa2cb978eb..0000000000 --- a/projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/gulpfile.js +++ /dev/null @@ -1,22 +0,0 @@ -const { src, dest, series } = require('gulp'); -const babel = require('gulp-babel'); - -function script() { - return src('src/**/*.js') - .pipe( - babel({ - presets: ['es2015'], - plugins: [ - 'transform-es2015-modules-systemjs', - 'transform-es2015-for-of', - ], - }) - ) - .pipe(dest('dist')); -} - -function srcToDist() { - return src(['src/**/*', '!src/**/*.js']).pipe(dest('dist')); -} - -exports.default = series(script, srcToDist); diff --git a/projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/package.json b/projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/package.json deleted file mode 100644 index b7f66630a1..0000000000 --- a/projects/rocprofiler-compute/grafana_plugins/omniperfData_plugin/package.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "name": "amd-omniperf-data-plugin", - "version": "1.0.0", - "description": "", - "main": "server/mongo-proxy.js", - "scripts": { - "build": "gulp", - "test": "echo 'No test found'", - "server": "cd server && node mongo-proxy.js" - }, - "author": "Audacious Software Group", - "license": "MIT", - "devDependencies": { - "babel-core": "^6.26.3", - "babel-plugin-transform-es2015-for-of": "^6.23.0", - "babel-plugin-transform-es2015-modules-systemjs": "^6.24.1", - "babel-preset-es2015": "^6.24.1", - "chai": "~4.2.0", - "gulp": "^4.0.2", - "gulp-babel": "^7.0.1", - "jsdom": ">=16.5.0", - "prunk": "^1.3.1", - "q": "^1.5.1" - }, - "dependencies": { - "body-parser": "^1.19.0", - "config": "^3.3.1", - "express": "^4.17.1", - "fs": "0.0.1-security", - "lodash": "^4.17.15", - "mocha": "^7.1.2", - "moment": "^2.24.0", - "mongodb": "^3.5.7", - "statman-stopwatch": "^2.18.0" - }, - "_comments": "Dependencies are not included as part of Omniperf. It's the user's responsibility to accept any licensing implications before building the project." -} diff --git a/projects/rocprofiler-compute/grafana_plugins/svg_plugin/.config/.eslintrc b/projects/rocprofiler-compute/grafana_plugins/svg_plugin/.config/.eslintrc deleted file mode 100644 index 3f8c381a4b..0000000000 --- a/projects/rocprofiler-compute/grafana_plugins/svg_plugin/.config/.eslintrc +++ /dev/null @@ -1,13 +0,0 @@ -/* - * ⚠️⚠️⚠️ THIS FILE WAS SCAFFOLDED BY `@grafana/create-plugin`. DO NOT EDIT THIS FILE DIRECTLY. ⚠️⚠️⚠️ - * - * In order to extend the configuration follow the steps in - * https://grafana.github.io/plugin-tools/docs/advanced-configuration#extending-the-eslint-config - */ - { - "extends": ["@grafana/eslint-config"], - "root": true, - "rules": { - "react/prop-types": "off" - } -} diff --git a/projects/rocprofiler-compute/grafana_plugins/svg_plugin/.config/.prettierrc.js b/projects/rocprofiler-compute/grafana_plugins/svg_plugin/.config/.prettierrc.js deleted file mode 100644 index 66a76ec5bc..0000000000 --- a/projects/rocprofiler-compute/grafana_plugins/svg_plugin/.config/.prettierrc.js +++ /dev/null @@ -1,16 +0,0 @@ -/* - * ⚠️⚠️⚠️ THIS FILE WAS SCAFFOLDED BY `@grafana/create-plugin`. DO NOT EDIT THIS FILE DIRECTLY. ⚠️⚠️⚠️ - * - * In order to extend the configuration follow the steps in .config/README.md - */ - -module.exports = { - "endOfLine": "auto", - "printWidth": 120, - "trailingComma": "es5", - "semi": true, - "jsxSingleQuote": false, - "singleQuote": true, - "useTabs": false, - "tabWidth": 2 -}; \ No newline at end of file diff --git a/projects/rocprofiler-compute/grafana_plugins/svg_plugin/.config/Dockerfile b/projects/rocprofiler-compute/grafana_plugins/svg_plugin/.config/Dockerfile deleted file mode 100644 index 35d89bd1c1..0000000000 --- a/projects/rocprofiler-compute/grafana_plugins/svg_plugin/.config/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -ARG grafana_version=latest -ARG grafana_image=grafana-enterprise - -FROM grafana/${grafana_image}:${grafana_version} - -# Make it as simple as possible to access the grafana instance for development purposes -# Do NOT enable these settings in a public facing / production grafana instance -ENV GF_AUTH_ANONYMOUS_ORG_ROLE "Admin" -ENV GF_AUTH_ANONYMOUS_ENABLED "true" -ENV GF_AUTH_BASIC_ENABLED "false" -# Set development mode so plugins can be loaded without the need to sign -ENV GF_DEFAULT_APP_MODE "development" - -# Inject livereload script into grafana index.html -USER root -RUN sed -i 's/<\/body><\/html>/