From c68ba8a46e8462b4ef8146e9d2cc50cf15a9fdba Mon Sep 17 00:00:00 2001 From: Aditya Jindal <“aditjind@users.noreply.github.com”> Date: Thu, 21 Jan 2021 15:39:47 -0800 Subject: [PATCH 1/2] Update the Perftop Package with new naming Convention --- README.md | 6 +++--- build.gradle | 8 ++++---- package.json | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index e4c6544..802584f 100644 --- a/README.md +++ b/README.md @@ -80,12 +80,12 @@ Supported platforms: Linux, macOS npm: ```bash -perf-top --dashboard NodeAnalysis +opendistro-perf-top --dashboard NodeAnalysis ``` Excutables: ``` -./perf-top-${PLATFORM} --dashboard $JSON --endpoint $ENDPOINT +./opendistro-perf-top-${PLATFORM} --dashboard $JSON --endpoint $ENDPOINT ``` ## Build @@ -97,7 +97,7 @@ Prerequisites: 1. Clone/download from Github 2. Run `./gradlew build -Dbuild.linux={true/false} -Dbuild.macos={true/false}`. This will run the following: 1. `npm install` - locally installs dependencies - 2. `npm run build-{linux/macos}` - creates "perf-top-{linux/macos}" executables. + 2. `npm run build-{linux/macos}` - creates "opendistro-perf-top-{linux/macos}" executables. 3. For cleaning, run `./gradlew clean` which will run: 1. `npm run clean` - deletes locally installed dependencies and executables diff --git a/build.gradle b/build.gradle index 1061836..0d906cb 100644 --- a/build.gradle +++ b/build.gradle @@ -82,23 +82,23 @@ clean { // We are excluding plugin descriptor for PerfTop // The info here could be random esplugin { - name 'perf-top' + name 'opendistro-perf-top' description 'PerfTop' classname 'com.amazon.opendistro.elasticsearch.performanceanalyzer.PerformanceAnalyzerPlugin' } bundlePlugin { - exclude "perf-top*.jar" + exclude "opendistro-perf-top*.jar" exclude "plugin-descriptor.properties" if (isLinux) { from ("build/") { - include "perf-top-linux" + include "opendistro-perf-top-linux" } } if (isMacOS) { from ("build/") { - include "perf-top-macos" + include "opendistro-perf-top-macos" } } from ("dashboards/") { diff --git a/package.json b/package.json index c7c6e11..b65d0ba 100644 --- a/package.json +++ b/package.json @@ -4,14 +4,14 @@ "description": "PerfTop CLI tool for Open Distro Performance Analyzer", "author": "Amazon Web Services", "bin": { - "perf-top": "./bin/global.js" + "opendistro-perf-top": "./bin/global.js" }, "preferGlobal": "true", "scripts": { - "build-linux": "./node_modules/.bin/pkg . --targets linux --output ./build/perf-top-linux", - "build-macos": "./node_modules/.bin/pkg . --targets macos --output ./build/perf-top-macos", + "build-linux": "./node_modules/.bin/pkg . --targets linux --output ./build/opendistro-perf-top-linux", + "build-macos": "./node_modules/.bin/pkg . --targets macos --output ./build/opendistro-perf-top-macos", "clean": "rm -rf ./build 2>/dev/null || true && rm -rf ./node_modules", - "lint": "./node_modules/.bin/eslint lib/perf-top/ lib/bin.js bin/global.js", + "lint": "./node_modules/.bin/eslint lib/opendistro-perf-top/ lib/bin.js bin/global.js", "test": "echo \"Error: no test specified\" && exit 1" }, "repository": { From 329bde174667331f097ecfd436cc65080676d094 Mon Sep 17 00:00:00 2001 From: Aditya Jindal <“aditjind@users.noreply.github.com”> Date: Fri, 22 Jan 2021 11:18:55 -0800 Subject: [PATCH 2/2] Adding x64 Suffix --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 0d906cb..f77a2f3 100644 --- a/build.gradle +++ b/build.gradle @@ -33,10 +33,10 @@ ext { group = "com.amazon.opendistroforelasticsearch" version = "${opendistroVersion}.0" if (isLinux) { - version += "-LINUX" + version += "-linux-x64" } if (isMacOS) { - version += "-MACOS" + version += "-macos-x64" } if (isSnapshot) { version += "-SNAPSHOT"