Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Update the Perftop Package with new naming Convention for ODFE #68

Merged
merged 2 commits into from
Jan 26, 2021
Merged

Update the Perftop Package with new naming Convention for ODFE #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c68ba8a
Update the Perftop Package with new naming Convention
Jan 21, 2021
329bde1
Adding x64 Suffix
Jan 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
12 changes: 6 additions & 6 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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/") {
Expand Down
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down