Skip to content

Commit

Permalink
Fix a bug with the new version of Feign, update dashboard config, ez.…
Browse files Browse the repository at this point in the history
…sh and readme
  • Loading branch information
ylacaute committed Dec 22, 2019
1 parent 9364d5c commit aa84e83
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 15 deletions.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ __Tech Stack__

## Online

I disabled the previous online demo based on real public API because those API are out of date, as the result the
online demo is now only the frontend started with mocked API, like in development.
The online demo shows a running dashboard (release 1.2.0) configured to consume online public API (without
authentication). Some API are maybe out of date as the consequence the widgets are loading infinitely.
For example, it seems it is not possible to call demo.qotilabs.com without authentitfication anymore, or maybe
we should update the dashboard config.

Go on [http://demo.thorpora.fr/ez-dashing/](http://demo.thorpora.fr/ez-dashing/)

Expand Down
24 changes: 12 additions & 12 deletions config/online/dashboard.json
Original file line number Diff line number Diff line change
Expand Up @@ -126,22 +126,22 @@
},
"queries" : [ {
"id" : "sonar-stats-systemA",
"path" : "/api/measures/component?componentKey=org.starchartlabs.lockdown:lockdown&metricKeys=coverage,lines,violations&format=json"
"path" : "/api/measures/component?componentKey=org.starchartlabs.lockdown:lockdown&metricKeys=coverage,lines,violations"
}, {
"id" : "sonar-stats-systemB",
"path" : "/api/measures/component?componentKey=org.github.Kitteh6660:Corruption-of-Champions-Mod&metricKeys=coverage,lines,violations&format=json"
"path" : "/api/measures/component?componentKey=org.github.Kitteh6660:Corruption-of-Champions-Mod&metricKeys=coverage,lines,violations"
}, {
"id" : "sonar-stats-systemC",
"path" : "/api/measures/component?componentKey=com.opentext.ia:infoarchive-sdk&metricKeys=coverage,lines,violations&format=json"
"path" : "/api/measures/component?componentKey=com.opentext.ia:infoarchive-sdk&metricKeys=coverage,lines,violations"
}, {
"id" : "sonar-stats-systemD",
"path" : "/api/measures/component?componentKey=atlasboard&metricKeys=coverage,lines,violations&format=json"
"path" : "/api/measures/component?componentKey=simgrid_simgrid&metricKeys=coverage,lines,violations"
}, {
"id" : "sonar-stats-systemE",
"path" : "/api/measures/component?componentKey=io.legaldocml:legaldocml&metricKeys=coverage,lines,violations&format=json"
"path" : "/api/measures/component?componentKey=io.legaldocml:legaldocml&metricKeys=coverage,lines,violations"
}, {
"id" : "sonar-stats-systemF",
"path" : "/api/measures/component?componentKey=de.schrieveslaach.effective-nlp-application-development:feature-test-nlp-models&metricKeys=coverage,lines,violations&format=json"
"path" : "/api/measures/component?componentKey=monica&metricKeys=coverage,lines,violations"
} ]
}, {
"baseUrl" : "https://builds.apache.org",
Expand All @@ -158,22 +158,22 @@
},
"queries" : [ {
"id" : "jenkins-lastBuild-systemA",
"path" : "/job/HBase-Flaky-Tests/lastBuild/api/json?pretty=true&depth=1"
"path" : "/job/camel-quarkus-pr/lastBuild/api/json?pretty=true&depth=1"
}, {
"id" : "jenkins-lastBuild-systemB",
"path" : "/job/Solr-reference-guide-7.0/lastBuild/api/json?pretty=true&depth=1"
"path" : "/job/heron-website/lastBuild/api/json?pretty=true&depth=1"
}, {
"id" : "jenkins-lastBuild-systemC",
"path" : "/job/Allura-rat/lastBuild/api/json?pretty=true&depth=1"
"path" : "/job/ActiveMQ-Java8/lastBuild/api/json?pretty=true&depth=1"
}, {
"id" : "jenkins-lastBuild-systemD",
"path" : "/job/incubator-trafficcontrol-docs/lastBuild/api/json?pretty=true&depth=1"
"path" : "/job/netbeans-linux-jdk11/lastBuild/api/json?pretty=true&depth=1"
}, {
"id" : "jenkins-lastBuild-systemE",
"path" : "/job/Solr-reference-guide-7.x/lastBuild/api/json?pretty=true&depth=1"
"path" : "/job/ActiveMQ-Trunk-Deploy/lastBuild/api/json?pretty=true&depth=1"
}, {
"id" : "jenkins-lastBuild-systemF",
"path" : "/job/kafka-pr-jdk9-scala2.12/lastBuild/api/json?pretty=true&depth=1"
"path" : "/job/Ivy-tests-ubuntu/lastBuild/api/json?pretty=true&depth=1"
} ]
} ],
"widgets" : [ {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

public interface APIConsumer {

@RequestLine("GET /{path}?")
@RequestLine("GET /{path}")
String query(@Param("path") String path, @QueryMap Map<String, String> params);

}
15 changes: 15 additions & 0 deletions ez.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,16 @@ function pushDockerImage {
docker push ${DOCKER_BASE_TAG}:${version}
}

function release {
local version=$1

set -e
buildProduction ${version}
createDockerImage ${version}
pushDockerImage ${version}
set +e
}

# --------------------------------------------------------------------------- #
# START PROD
# --------------------------------------------------------------------------- #
Expand Down Expand Up @@ -125,6 +135,9 @@ function usage {
usageSubTitle " push-docker-image" "[version]"
echo " Push the image with the given version to Docker Hub."
echo " When no version is specified, use latest."
usageSubTitle " release" "[version]"
echo " Build, create and push the docker image with the given version."
echo " When no version is specified, use latest."
echo
usageTitle "SAMPLES"
usageSubTitle " Build and push the ez-Dashing latest image:"
Expand Down Expand Up @@ -152,6 +165,8 @@ function main {
createDockerImage $@;;
push-docker-image)
pushDockerImage $@;;
release)
release $@;;
*)
usage ${0}
esac
Expand Down

0 comments on commit aa84e83

Please sign in to comment.