Skip to content

Commit

Permalink
Decoupled monitoring configuration and deployment (#13152)
Browse files Browse the repository at this point in the history
* Decoupled monitoring configuration and deployment

Signed-off-by: Sergii Kabashniuk <skabashniuk@redhat.com>
  • Loading branch information
skabashnyuk authored Jun 7, 2019
1 parent 7312af9 commit ea4b2ee
Show file tree
Hide file tree
Showing 7 changed files with 5,480 additions and 5,513 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/search/** @skabas

# deploy
deploy/** @l0rd @sleshchenko
deploy/openshift/templates/che-monitoring.yaml @skabashnyuk @metlos
deploy/openshift/templates/monitoring/** @skabashnyuk @metlos

# selenium tests
selenium/** @musienko-maxim @dmytro-ndp @Ohrimenko1988
5 changes: 4 additions & 1 deletion deploy/openshift/deploy_che.sh
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,10 @@ deployJaeger(){
deployMetrics(){
if [ "${CHE_METRICS_ENABLED}" == "true" ]; then
echo "Deploying Grafana and Prometheus..."
${OC_BINARY} new-app -f ${BASE_DIR}/templates/che-monitoring.yaml
${OC_BINARY} apply -f ${BASE_DIR}/templates/monitoring/grafana-dashboards.yaml
${OC_BINARY} apply -f ${BASE_DIR}/templates/monitoring/grafana-datasources.yaml
${OC_BINARY} apply -f ${BASE_DIR}/templates/monitoring/prometheus-config.yaml
${OC_BINARY} new-app -f ${BASE_DIR}/templates/monitoring/che-monitoring.yaml
echo "Grafana deployment complete. $($OC_BINARY get route/grafana --namespace=${CHE_OPENSHIFT_PROJECT} -o=jsonpath={'.spec.host'})"
echo "Prometheus deployment complete. $($OC_BINARY get route/prometheus --namespace=${CHE_OPENSHIFT_PROJECT} -o=jsonpath={'.spec.host'})"
fi
Expand Down
Loading

0 comments on commit ea4b2ee

Please sign in to comment.