Skip to content

Switched from latest grafana to 3.12.0 version of helm chart due syntax error in chart https://github.com/helm/charts/issues/18215 #1310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 24, 2019
Merged

Switched from latest grafana to 3.12.0 version of helm chart due syntax error in chart https://github.com/helm/charts/issues/18215 #1310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
92dbe47
added debug
Oct 18, 2019
bf2f00b
added debug1
Oct 18, 2019
b9f5cb9
Merge branch 'develop' of https://github.com/oracle/weblogic-kubernet…
Oct 21, 2019
978d98a
Merge branch 'develop' of https://github.com/oracle/weblogic-kubernet…
Oct 22, 2019
a9cbd8e
replaced latest version to 3.12.0 version of helmchart grafana
Oct 23, 2019
9e3edd0
cleaned commented out lines
Oct 24, 2019
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
4 changes: 2 additions & 2 deletions integration-tests/src/test/java/oracle/kubernetes/operator/ItMonitoringExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -890,8 +890,7 @@ private static void setupPv() throws Exception {
* @throws Exception if could not run the command successfully to create WLSImage and deploy
*/
private static void createWlsImageAndDeploy() throws Exception {
//operator1 = TestUtils.createOperator(OPERATOR1_YAML);
addRestOptToYaml(monitoringExporterEndToEndDir + "/dashboard/exporter-config.yaml", "restPort", 8001);
logger.info(" Starting to create WLS Image");

String command =
"cd "
Expand All @@ -903,6 +902,7 @@ private static void createWlsImageAndDeploy() throws Exception {
+ " wluser1 wlpwd123";
TestUtils.exec(command);

logger.info(" Starting to create WLS secret");
command =
"kubectl -n default create secret generic domain1-weblogic-credentials "
+ " --from-literal=username="
Expand Down
8 changes: 6 additions & 2 deletions integration-tests/src/test/resources/exporter/redeployPromGrafanaLatestChart.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,14 @@ monitoringExporterDir=$1
resourceExporterDir=$2
monitoringExporterEndToEndDir=${monitoringExporterDir}/src/samples/kubernetes/end2end

POD_NAME=$(kubectl get pod -l app=grafana -n monitoring -o jsonpath="{.items[0].metadata.name}")
POD_NAME1=$(kubectl get pod -l app=prometheus -n monitoring -o jsonpath="{.items[0].metadata.name}")
helm delete prometheus --purge
helm delete grafana --purge

kubectl delete $POD_NAME --force --grace-period=0 --ignore-not-found
kubectl delete $POD_NAME1 --force --grace-period=0 --ignore-not-found
helm install --wait --name prometheus --namespace monitoring --values ${resourceExporterDir}/promvalues.yaml stable/prometheus

helm install --wait --name grafana --namespace monitoring --values ${monitoringExporterEndToEndDir}/grafana/values.yaml stable/grafana
#remove version after https://github.com/helm/charts/issues/18215 will be fixed
helm install --wait --name grafana --namespace monitoring --values ${monitoringExporterEndToEndDir}/grafana/values.yaml stable/grafana --version=3.12.0
echo "Run the script [redeployPromGrafanaLatestChart.sh] ..."