diff --git a/.lgtm.yml b/.lgtm.yml index abcba17087f..223e794dc87 100644 --- a/.lgtm.yml +++ b/.lgtm.yml @@ -19,4 +19,4 @@ queries: extraction: java: index: - build_command: mvn clean package -f "pom.xml" -B -V -e -Dfindbugs.skip -Dcheckstyle.skip -Dpmd.skip=true -Denforcer.skip -Dmaven.javadoc.skip -DskipTests -Dmaven.test.skip.exec -Dlicense.skip=true -Ddruid.console.skip=true + build_command: mvn clean package -f "pom.xml" -B -V -e -Dfindbugs.skip -Dcheckstyle.skip -Dpmd.skip=true -Denforcer.skip -Dmaven.javadoc.skip -DskipTests -Dmaven.test.skip.exec -Dlicense.skip=true -Dweb.console.skip=true diff --git a/.travis.yml b/.travis.yml index 894fd3f7b77..825039b4b50 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ env: - DOCKER_IP=127.0.0.1 # for integration tests - MVN="mvn -B" - > # Various options to make execution of maven goals faster (e.g., mvn install) - MAVEN_SKIP="-P skip-static-checks -Ddruid.console.skip=true -Dmaven.javadoc.skip=true" + MAVEN_SKIP="-P skip-static-checks -Dweb.console.skip=true -Dmaven.javadoc.skip=true" - MAVEN_SKIP_TESTS="-P skip-tests" addons: @@ -43,7 +43,7 @@ addons: - maven - python3 -# Add various options to make 'mvn install' fast and skip javascript compile (-Ddruid.console.skip=true) since it is not +# Add various options to make 'mvn install' fast and skip javascript compile (-Dweb.console.skip=true) since it is not # needed. Depending on network speeds, "mvn -q install" may take longer than the default 10 minute timeout to print any # output. To compensate, use travis_wait to extend the timeout. install: ./check_test_suite.py && travis_terminate 0 || echo 'Running Maven install...' && MAVEN_OPTS='-Xmx3000m' travis_wait 15 ${MVN} clean install -q -ff -pl '!distribution,!:druid-it-image,!:druid-it-cases' ${MAVEN_SKIP} ${MAVEN_SKIP_TESTS} -T1C && ${MVN} install -q -ff -pl 'distribution' ${MAVEN_SKIP} ${MAVEN_SKIP_TESTS} @@ -179,7 +179,7 @@ jobs: before_script: *setup_generate_license script: > MAVEN_OPTS='-Xmx3000m' ${MVN} clean install -Prat -Pdist -Pbundle-contrib-exts --fail-at-end - -pl '!benchmarks' ${MAVEN_SKIP} ${MAVEN_SKIP_TESTS} -Ddruid.console.skip=false -T1C + -pl '!benchmarks' ${MAVEN_SKIP} ${MAVEN_SKIP_TESTS} -Dweb.console.skip=false -T1C - <<: *package name: "(openjdk11) packaging check" @@ -419,7 +419,7 @@ jobs: jdk: openjdk11 env: - MAVEN_PROJECTS='core,indexing-hadoop,indexing-service,processing' - script: ${MVN} test -B -pl ${MAVEN_PROJECTS} -Ddruid.console.skip=true -DargLine=-Xmx3000m + script: ${MVN} test -B -pl ${MAVEN_PROJECTS} -Dweb.console.skip=true -DargLine=-Xmx3000m - name: "Build and test on ARM64 CPU architecture (2)" stage: Tests - phase 2 @@ -430,7 +430,7 @@ jobs: jdk: openjdk11 env: - MAVEN_PROJECTS='core,sql,server,services' - script: ${MVN} test -B -pl ${MAVEN_PROJECTS} -Ddruid.console.skip=true -DargLine=-Xmx3000m + script: ${MVN} test -B -pl ${MAVEN_PROJECTS} -Dweb.console.skip=true -DargLine=-Xmx3000m # Integration tests Java Compile version is set by the machine environment jdk (set by the jdk key) diff --git a/README.md b/README.md index aea332f1942..97de711c4cd 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ Druid is designed for workflows where fast queries and ingest really matter. Dru You can get started with Druid with our [local](https://druid.apache.org/docs/latest/tutorials/quickstart.html) or [Docker](http://druid.apache.org/docs/latest/tutorials/docker.html) quickstart. Druid provides a rich set of APIs (via HTTP and [JDBC](https://druid.apache.org/docs/latest/querying/sql.html#jdbc)) for loading, managing, and querying your data. -You can also interact with Druid via the [built-in console](https://druid.apache.org/docs/latest/operations/druid-console.html) (shown below). +You can also interact with Druid via the built-in [web console](https://druid.apache.org/docs/latest/operations/web-console.html) (shown below). #### Load data diff --git a/dev/intellij-setup.md b/dev/intellij-setup.md index c2536e7b131..2ddceb90978 100644 --- a/dev/intellij-setup.md +++ b/dev/intellij-setup.md @@ -67,7 +67,7 @@ Before running or debugging the apps, you should do a `mvn clean install -Pdist `-Pdist` is required because it puts all core extensions under `distribution\target\extensions` directory, where `runConfigurations` below could load extensions from. -You may also add `-Ddruid.console.skip=true` to the command if you're focusing on backend servers instead of frontend project. This option saves great building time. +You may also add `-Dweb.console.skip=true` to the command if you're focusing on backend servers instead of frontend project. This option saves great building time. ## Debug a running Druid cluster using Intellij Intellij IDEA debugger can attach to a local or remote Java process (Druid process). diff --git a/distribution/bin/web-console-dep-lister.py b/distribution/bin/web-console-dep-lister.py index 3ee66a10f2c..afc7638b7d0 100755 --- a/distribution/bin/web-console-dep-lister.py +++ b/distribution/bin/web-console-dep-lister.py @@ -18,7 +18,7 @@ import re import sys -# Helper program for listing the deps in the compiled web-console-.js file in druid-console.jar +# Helper program for listing the deps in the compiled web-console-.js file in web-console.jar if len(sys.argv) != 2: sys.stderr.write('usage: program \n') diff --git a/distribution/pom.xml b/distribution/pom.xml index 7fab9200b0d..729d6f7bcda 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -42,7 +42,7 @@ org.apache.druid - druid-console + web-console ${project.parent.version} diff --git a/docs/development/build.md b/docs/development/build.md index 9036c8fbc45..b093b2e4f99 100644 --- a/docs/development/build.md +++ b/docs/development/build.md @@ -63,7 +63,7 @@ In addition to the basic stages, you may also want to add the following profiles - **-Papache-release** - Apache release profile: Generates GPG signature and checksums, and builds the source distribution tarball as `distribution/target/apache-druid-x.x.x-src.tar.gz` - **-Prat** - Apache Rat profile: Runs the Apache Rat license audit tool - **-DskipTests** - Skips unit tests (which reduces build time) -- **-Ddruid.console.skip=true** - Skip front end project +- **-Dweb.console.skip=true** - Skip front end project Putting these together, if you wish to build the source and binary distributions with signatures and checksums, audit licenses, and skip the unit tests, you would run: diff --git a/integration-tests-ex/docs/conversion.md b/integration-tests-ex/docs/conversion.md index b4a8b17d7c8..6a14533d3c4 100644 --- a/integration-tests-ex/docs/conversion.md +++ b/integration-tests-ex/docs/conversion.md @@ -123,7 +123,7 @@ Use the following to verify the `pom.xml`: ```bash mvn dependency:analyze -DoutputXML=true -DignoreNonCompile=true \ - -P skip-static-checks -Ddruid.console.skip=true -Dmaven.javadoc.skip=true \ + -P skip-static-checks -Dweb.console.skip=true -Dmaven.javadoc.skip=true \ -P skip-tests ``` diff --git a/integration-tests/script/copy_resources_template.sh b/integration-tests/script/copy_resources_template.sh index ef35da2ad9f..55fefd27c8e 100755 --- a/integration-tests/script/copy_resources_template.sh +++ b/integration-tests/script/copy_resources_template.sh @@ -30,7 +30,7 @@ cp -R docker $SHARED_DIR/docker pushd ../ rm -rf distribution/target/apache-druid-$DRUID_VERSION-integration-test-bin -mvn -P skip-static-checks,skip-tests -T1C -Danimal.sniffer.skip=true -Dcheckstyle.skip=true -Ddruid.console.skip=true -Denforcer.skip=true -Dforbiddenapis.skip=true -Dmaven.javadoc.skip=true -Dpmd.skip=true -Dspotbugs.skip=true install -Pintegration-test +mvn -P skip-static-checks,skip-tests -T1C -Danimal.sniffer.skip=true -Dcheckstyle.skip=true -Dweb.console.skip=true -Denforcer.skip=true -Dforbiddenapis.skip=true -Dmaven.javadoc.skip=true -Dpmd.skip=true -Dspotbugs.skip=true install -Pintegration-test mv distribution/target/apache-druid-$DRUID_VERSION-integration-test-bin/lib $SHARED_DIR/docker/lib mv distribution/target/apache-druid-$DRUID_VERSION-integration-test-bin/extensions $SHARED_DIR/docker/extensions popd diff --git a/web-console/pom.xml b/web-console/pom.xml index 7d52d790c19..6e8f48f1a14 100644 --- a/web-console/pom.xml +++ b/web-console/pom.xml @@ -21,9 +21,9 @@ 4.0.0 - druid-console - druid-console - Unified web console for a Druid cluster + web-console + web-console + Web console for Druid org.apache.druid @@ -33,7 +33,7 @@ ${project.build.directory}/resources - false + false v16.17.0 8.15.0 @@ -44,7 +44,7 @@ com.github.eirslett frontend-maven-plugin - ${druid.console.skip} + ${web.console.skip} ${skipUTs} @@ -108,7 +108,7 @@ org.codehaus.mojo exec-maven-plugin - ${druid.console.skip} + ${web.console.skip} @@ -152,7 +152,7 @@ maven-resources-plugin ${project.build.outputDirectory}/org/apache/druid/console - ${druid.console.skip} + ${web.console.skip} diff --git a/web-console/src/components/header-bar/header-bar.tsx b/web-console/src/components/header-bar/header-bar.tsx index 2d5b56af4d2..4f4c9ff922c 100644 --- a/web-console/src/components/header-bar/header-bar.tsx +++ b/web-console/src/components/header-bar/header-bar.tsx @@ -191,8 +191,8 @@ const RestrictedMode = React.memo(function RestrictedMode(props: RestrictedModeP {message}

For more info check out the{' '} - - console documentation + + web console documentation .

diff --git a/web-console/unified-console.html b/web-console/unified-console.html index 3fb49e6cf10..0f49d63d702 100644 --- a/web-console/unified-console.html +++ b/web-console/unified-console.html @@ -55,7 +55,7 @@