From 5b7ffdb0fff4f4451cdc6fba6174b8189492fa2a Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Mon, 12 Nov 2018 18:29:51 -0800 Subject: [PATCH 1/7] use environment variables --- run.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/run.sh b/run.sh index dbef69f..c815015 100755 --- a/run.sh +++ b/run.sh @@ -22,14 +22,12 @@ MYSQL_DATABASE=`echo $VCAP_SERVICES | jq -r '.["'$SERVICE'"][0].credentials.name SESSION_CONFIG="$MYSQL_USERNAME:$MYSQL_PASSWORD@tcp($MYSQL_HOSTNAME:$MYSQL_PORT)/$MYSQL_DATABASE" cd $GRAFANA_DIR -sed -i -e 's|^url =$|url = '$MYSQL_URI'|' ./conf/defaults.ini -sed -i -e 's|^type = sqlite3$|type = mysql|' ./conf/defaults.ini -sed -i -e 's|^http_port = 3000$|http_port = 8080|' ./conf/defaults.ini -sed -i -e 's|mode = console file|mode = console|' ./conf/defaults.ini +export GF_DATABASE_TYPE=mysql +export GF_DATABASE_URL=$MYSQL_URI # sed -i -e 's|max_idle_conn =|max_idle_conn = 1|' ./conf/defaults.ini # sed -i -e 's|max_open_conn =|max_open_conn = 3|' ./conf/defaults.ini # sed -i -e 's|provider = file|provider = mysql|' ./conf/defaults.ini # sed -i -e 's|provider_config = sessions|provider_config = '$SESSION_CONFIG'|' ./conf/defaults.ini echo "Start Grafana" -./bin/grafana-server web & \ No newline at end of file +./bin/grafana-server web & From 9e71238b4b4806ed90d0d6dca453620f92ab35f7 Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Mon, 12 Nov 2018 18:31:37 -0800 Subject: [PATCH 2/7] set port --- conf/custom.ini | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 conf/custom.ini diff --git a/conf/custom.ini b/conf/custom.ini new file mode 100644 index 0000000..548e944 --- /dev/null +++ b/conf/custom.ini @@ -0,0 +1,10 @@ +#################################### Server ############################## +[server] +# The http port to use +http_port = 8080 + +# The public facing domain name used to access grafana from a browser +domain = + +# The full public facing url +root_url = From ad315eaf075f23e73354d4bee5cf702334e0dfbd Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Mon, 12 Nov 2018 18:33:52 -0800 Subject: [PATCH 3/7] comment unused items --- run.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/run.sh b/run.sh index c815015..e7c58a0 100755 --- a/run.sh +++ b/run.sh @@ -13,13 +13,13 @@ fi echo "Detected $SERVICE" MYSQL_URI=`echo $VCAP_SERVICES | jq -r '.["'$SERVICE'"][0].credentials.uri'` -MYSQL_HOSTNAME=`echo $VCAP_SERVICES | jq -r '.["'$SERVICE'"][0].credentials.hostname'` -MYSQL_PASSWORD=`echo $VCAP_SERVICES | jq -r '.["'$SERVICE'"][0].credentials.password'` -MYSQL_PORT=`echo $VCAP_SERVICES | jq -r '.["'$SERVICE'"][0].credentials.port'` -MYSQL_USERNAME=`echo $VCAP_SERVICES | jq -r '.["'$SERVICE'"][0].credentials.username'` -MYSQL_DATABASE=`echo $VCAP_SERVICES | jq -r '.["'$SERVICE'"][0].credentials.name'` +# MYSQL_HOSTNAME=`echo $VCAP_SERVICES | jq -r '.["'$SERVICE'"][0].credentials.hostname'` +# MYSQL_PASSWORD=`echo $VCAP_SERVICES | jq -r '.["'$SERVICE'"][0].credentials.password'` +# MYSQL_PORT=`echo $VCAP_SERVICES | jq -r '.["'$SERVICE'"][0].credentials.port'` +# MYSQL_USERNAME=`echo $VCAP_SERVICES | jq -r '.["'$SERVICE'"][0].credentials.username'` +# MYSQL_DATABASE=`echo $VCAP_SERVICES | jq -r '.["'$SERVICE'"][0].credentials.name'` -SESSION_CONFIG="$MYSQL_USERNAME:$MYSQL_PASSWORD@tcp($MYSQL_HOSTNAME:$MYSQL_PORT)/$MYSQL_DATABASE" +# SESSION_CONFIG="$MYSQL_USERNAME:$MYSQL_PASSWORD@tcp($MYSQL_HOSTNAME:$MYSQL_PORT)/$MYSQL_DATABASE" cd $GRAFANA_DIR export GF_DATABASE_TYPE=mysql From 35ec982b8c03801acbf9a329a754fd50dfde05e5 Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Mon, 12 Nov 2018 19:07:27 -0800 Subject: [PATCH 4/7] Update run.sh --- run.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/run.sh b/run.sh index e7c58a0..2c37637 100755 --- a/run.sh +++ b/run.sh @@ -12,7 +12,6 @@ fi echo "Detected $SERVICE" -MYSQL_URI=`echo $VCAP_SERVICES | jq -r '.["'$SERVICE'"][0].credentials.uri'` # MYSQL_HOSTNAME=`echo $VCAP_SERVICES | jq -r '.["'$SERVICE'"][0].credentials.hostname'` # MYSQL_PASSWORD=`echo $VCAP_SERVICES | jq -r '.["'$SERVICE'"][0].credentials.password'` # MYSQL_PORT=`echo $VCAP_SERVICES | jq -r '.["'$SERVICE'"][0].credentials.port'` @@ -23,7 +22,7 @@ MYSQL_URI=`echo $VCAP_SERVICES | jq -r '.["'$SERVICE'"][0].credentials.uri'` cd $GRAFANA_DIR export GF_DATABASE_TYPE=mysql -export GF_DATABASE_URL=$MYSQL_URI +export GF_DATABASE_URL=${DATABASE_URL/mysql2/mysql} # replace "mysql2://..." which Grafana doesn't understand in $DATABASE_URL with "mysql://..." # sed -i -e 's|max_idle_conn =|max_idle_conn = 1|' ./conf/defaults.ini # sed -i -e 's|max_open_conn =|max_open_conn = 3|' ./conf/defaults.ini # sed -i -e 's|provider = file|provider = mysql|' ./conf/defaults.ini From 6543243f44fef07c03ef5f4dacf5e6af9e0301d8 Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Mon, 12 Nov 2018 19:13:03 -0800 Subject: [PATCH 5/7] Update README.md --- README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 26d98e1..862988a 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,9 @@ ``` git clone https://github.com/making/cf-grafana.git cd cf-grafana -wget https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-4.3.2.linux-x64.tar.gz -tar -zxvf grafana-4.3.2.linux-x64.tar.gz -mv grafana-4.3.2 grafana +wget https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.3.2.linux-amd64.tar.gz +tar -zxvf grafana-5.3.2.linux-amd64.tar.gz +mv grafana-5.3.2.linux-amd64 # In case of Pivotal Web Services cf create-service cleardb spark grafana-db # In case of Pivotal Cloud Foundry @@ -24,7 +24,6 @@ Go to https://my-grafana.cfapps.io > If you don't need to persist dashboards and users, you can use default sqlite3 as follows. This is much better experience than free ClearDB though everything in the instance will disappear when you restart the application. > > ``` -> sed -i -e 's|^http_port = 3000$|http_port = 8080|' ./conf/defaults.ini > cf push my-grafana -b binary_buildpack -c './bin/grafana-server web' -m 64m > ``` From 790683efdd93a4caf11db0b97eb352ad51d644dd Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Mon, 12 Nov 2018 19:14:02 -0800 Subject: [PATCH 6/7] Update custom.ini --- conf/custom.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/custom.ini b/conf/custom.ini index 548e944..e1ff5dc 100644 --- a/conf/custom.ini +++ b/conf/custom.ini @@ -4,7 +4,7 @@ http_port = 8080 # The public facing domain name used to access grafana from a browser -domain = +# domain = # The full public facing url -root_url = +# root_url = From ebf387db9aac4250dabfce143c42b19a0775e312 Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Sun, 12 May 2019 04:53:35 -0700 Subject: [PATCH 7/7] support grafana 6.x --- run.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/run.sh b/run.sh index 2c37637..93e15a6 100755 --- a/run.sh +++ b/run.sh @@ -22,6 +22,8 @@ echo "Detected $SERVICE" cd $GRAFANA_DIR export GF_DATABASE_TYPE=mysql +# drop ?reconnect=true from connection string because Grafana doesn't handle it properly +DATABASE_URL=${DATABASE_URL/?reconnect=true} export GF_DATABASE_URL=${DATABASE_URL/mysql2/mysql} # replace "mysql2://..." which Grafana doesn't understand in $DATABASE_URL with "mysql://..." # sed -i -e 's|max_idle_conn =|max_idle_conn = 1|' ./conf/defaults.ini # sed -i -e 's|max_open_conn =|max_open_conn = 3|' ./conf/defaults.ini