From 1df550395f991c90cba76d37f5a47aafc7f9734d Mon Sep 17 00:00:00 2001 From: Markus Date: Thu, 12 Jan 2017 13:01:10 +0100 Subject: [PATCH 1/8] Implement Plugin inclusion --- templates/grafana/0/docker-compose.yml | 1 + templates/grafana/0/rancher-compose.yml | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/templates/grafana/0/docker-compose.yml b/templates/grafana/0/docker-compose.yml index 895866b..58154db 100644 --- a/templates/grafana/0/docker-compose.yml +++ b/templates/grafana/0/docker-compose.yml @@ -6,3 +6,4 @@ grafana: GF_SECURITY_ADMIN_USER: ${admin_username} GF_SECURITY_ADMIN_PASSWORD: ${admin_password} GF_SECURITY_SECRET_KEY: ${secret_key} + GF_INSTALL_PLUGINS: ${install_plugins} diff --git a/templates/grafana/0/rancher-compose.yml b/templates/grafana/0/rancher-compose.yml index 648b5d3..68c9353 100644 --- a/templates/grafana/0/rancher-compose.yml +++ b/templates/grafana/0/rancher-compose.yml @@ -28,5 +28,11 @@ required: true default: "su2Tong2zoocie" type: "string" - + - variable: install_plugins + description: "Include/Install Grafana Plugins (comma-separated plugin-ids)" + label: "Install Plugins" + required: false + default: "grafana-clock-panel" + type: "string" + grafana: From da5abce8be90b5cb0a62e702075b0eb5c750055e Mon Sep 17 00:00:00 2001 From: Markus Date: Thu, 12 Jan 2017 13:09:31 +0100 Subject: [PATCH 2/8] changed template version string to match grafana image tag --- templates/grafana/0/rancher-compose.yml | 2 +- templates/grafana/config.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/grafana/0/rancher-compose.yml b/templates/grafana/0/rancher-compose.yml index 68c9353..6070594 100644 --- a/templates/grafana/0/rancher-compose.yml +++ b/templates/grafana/0/rancher-compose.yml @@ -1,6 +1,6 @@ .catalog: name: "Grafana" - version: "3.0.2-rancher1" + version: "latest-rancher1" description: | (Experimental) Grafana: Beautiful metric & analytic dashboards questions: diff --git a/templates/grafana/config.yml b/templates/grafana/config.yml index 3b6394e..22270d4 100644 --- a/templates/grafana/config.yml +++ b/templates/grafana/config.yml @@ -1,4 +1,4 @@ name: "Grafana" description: "Visualization dashboard" -version: "3.0.2-rancher1" +version: "latest-rancher1" category: Monitoring From 7a247c463b30dafc4eb3cf99c7bb1e1b4300f9b9 Mon Sep 17 00:00:00 2001 From: Markus Fischbacher Date: Wed, 8 Feb 2017 08:31:56 +0100 Subject: [PATCH 3/8] Update rancher-compose.yml --- templates/grafana/0/rancher-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/grafana/0/rancher-compose.yml b/templates/grafana/0/rancher-compose.yml index 6070594..846626b 100644 --- a/templates/grafana/0/rancher-compose.yml +++ b/templates/grafana/0/rancher-compose.yml @@ -1,6 +1,6 @@ .catalog: name: "Grafana" - version: "latest-rancher1" + version: "4.1.1-rancher1" description: | (Experimental) Grafana: Beautiful metric & analytic dashboards questions: From e1df0981f7354c999cd39535ba6edf5c1ab30652 Mon Sep 17 00:00:00 2001 From: Markus Fischbacher Date: Wed, 8 Feb 2017 08:32:10 +0100 Subject: [PATCH 4/8] Update config.yml --- templates/grafana/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/grafana/config.yml b/templates/grafana/config.yml index 22270d4..0f48e2e 100644 --- a/templates/grafana/config.yml +++ b/templates/grafana/config.yml @@ -1,4 +1,4 @@ name: "Grafana" description: "Visualization dashboard" -version: "latest-rancher1" +version: "4.1.1-rancher1" category: Monitoring From be2c9a705c6b103645b41a1807c527fa5fb6b5fa Mon Sep 17 00:00:00 2001 From: Markus Fischbacher Date: Fri, 10 Mar 2017 08:45:41 +0100 Subject: [PATCH 5/8] changed from latest to a detailed tag --- templates/grafana/0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/grafana/0/docker-compose.yml b/templates/grafana/0/docker-compose.yml index 58154db..ad6b5c0 100644 --- a/templates/grafana/0/docker-compose.yml +++ b/templates/grafana/0/docker-compose.yml @@ -1,5 +1,5 @@ grafana: - image: grafana/grafana:latest + image: grafana/grafana:4.1.1 ports: - ${http_port}:3000 environment: From 50899d057599fe163a835cb327d958d43f92fdbc Mon Sep 17 00:00:00 2001 From: Markus Date: Fri, 10 Mar 2017 08:50:26 +0100 Subject: [PATCH 6/8] changed to Grafana version 4.1.2 --- templates/grafana/1/docker-compose.yml | 9 ++++++ templates/grafana/1/rancher-compose.yml | 38 +++++++++++++++++++++++++ templates/grafana/config.yml | 4 +-- 3 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 templates/grafana/1/docker-compose.yml create mode 100644 templates/grafana/1/rancher-compose.yml diff --git a/templates/grafana/1/docker-compose.yml b/templates/grafana/1/docker-compose.yml new file mode 100644 index 0000000..a58b8f9 --- /dev/null +++ b/templates/grafana/1/docker-compose.yml @@ -0,0 +1,9 @@ +grafana: + image: grafana/grafana:4.1.2 + ports: + - ${http_port}:3000 + environment: + GF_SECURITY_ADMIN_USER: ${admin_username} + GF_SECURITY_ADMIN_PASSWORD: ${admin_password} + GF_SECURITY_SECRET_KEY: ${secret_key} + GF_INSTALL_PLUGINS: ${install_plugins} diff --git a/templates/grafana/1/rancher-compose.yml b/templates/grafana/1/rancher-compose.yml new file mode 100644 index 0000000..5fd90f1 --- /dev/null +++ b/templates/grafana/1/rancher-compose.yml @@ -0,0 +1,38 @@ +.catalog: + name: "Grafana" + version: "4.1.2-rancher1" + description: | + (Experimental) Grafana: Beautiful metric & analytic dashboards + questions: + - variable: http_port + description: "http port to access Grafana" + label: "Http Port" + required: true + default: "3000" + type: "int" + - variable: admin_username + description: "Grafana admin username" + label: "Admin Username" + required: true + default: "admin" + type: "string" + - variable: admin_password + description: "Grafana admin password" + label: "Admin Password" + required: true + default: "password" + type: "string" + - variable: secret_key + description: "Signing secret key" + label: "Secret Key" + required: true + default: "su2Tong2zoocie" + type: "string" + - variable: install_plugins + description: "Include/Install Grafana Plugins (comma-separated plugin-ids)" + label: "Install Plugins" + required: false + default: "grafana-clock-panel" + type: "string" + +grafana: diff --git a/templates/grafana/config.yml b/templates/grafana/config.yml index 0f48e2e..b4a14f8 100644 --- a/templates/grafana/config.yml +++ b/templates/grafana/config.yml @@ -1,4 +1,4 @@ name: "Grafana" description: "Visualization dashboard" -version: "4.1.1-rancher1" -category: Monitoring +version: "4.1.2-rancher1" +category: Monitoring \ No newline at end of file From 976227d363a738f05518c871de8c735a5aa09a1b Mon Sep 17 00:00:00 2001 From: Markus Date: Fri, 10 Mar 2017 08:57:23 +0100 Subject: [PATCH 7/8] typo for previous version --- templates/grafana/0/rancher-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/grafana/0/rancher-compose.yml b/templates/grafana/0/rancher-compose.yml index 846626b..a4e32b1 100644 --- a/templates/grafana/0/rancher-compose.yml +++ b/templates/grafana/0/rancher-compose.yml @@ -1,6 +1,6 @@ .catalog: name: "Grafana" - version: "4.1.1-rancher1" + version: "4.1.1-rancher0" description: | (Experimental) Grafana: Beautiful metric & analytic dashboards questions: From f4cbfba970aad3a67ab139f11cdc7b7a8d75d66d Mon Sep 17 00:00:00 2001 From: Markus Date: Tue, 11 Apr 2017 08:20:44 +0200 Subject: [PATCH 8/8] changed Grafana version 4.2.0 --- templates/grafana/2/docker-compose.yml | 9 ++++++ templates/grafana/2/rancher-compose.yml | 38 +++++++++++++++++++++++++ templates/grafana/config.yml | 2 +- 3 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 templates/grafana/2/docker-compose.yml create mode 100644 templates/grafana/2/rancher-compose.yml diff --git a/templates/grafana/2/docker-compose.yml b/templates/grafana/2/docker-compose.yml new file mode 100644 index 0000000..70bd59e --- /dev/null +++ b/templates/grafana/2/docker-compose.yml @@ -0,0 +1,9 @@ +grafana: + image: grafana/grafana:4.2.0 + ports: + - ${http_port}:3000 + environment: + GF_SECURITY_ADMIN_USER: ${admin_username} + GF_SECURITY_ADMIN_PASSWORD: ${admin_password} + GF_SECURITY_SECRET_KEY: ${secret_key} + GF_INSTALL_PLUGINS: ${install_plugins} diff --git a/templates/grafana/2/rancher-compose.yml b/templates/grafana/2/rancher-compose.yml new file mode 100644 index 0000000..a3b7b6e --- /dev/null +++ b/templates/grafana/2/rancher-compose.yml @@ -0,0 +1,38 @@ +.catalog: + name: "Grafana" + version: "4.2.0-rancher2" + description: | + (Experimental) Grafana: Beautiful metric & analytic dashboards + questions: + - variable: http_port + description: "http port to access Grafana" + label: "Http Port" + required: true + default: "3000" + type: "int" + - variable: admin_username + description: "Grafana admin username" + label: "Admin Username" + required: true + default: "admin" + type: "string" + - variable: admin_password + description: "Grafana admin password" + label: "Admin Password" + required: true + default: "password" + type: "string" + - variable: secret_key + description: "Signing secret key" + label: "Secret Key" + required: true + default: "su2Tong2zoocie" + type: "string" + - variable: install_plugins + description: "Include/Install Grafana Plugins (comma-separated plugin-ids)" + label: "Install Plugins" + required: false + default: "grafana-clock-panel" + type: "string" + +grafana: diff --git a/templates/grafana/config.yml b/templates/grafana/config.yml index b4a14f8..9e813d6 100644 --- a/templates/grafana/config.yml +++ b/templates/grafana/config.yml @@ -1,4 +1,4 @@ name: "Grafana" description: "Visualization dashboard" -version: "4.1.2-rancher1" +version: "4.2.0-rancher2" category: Monitoring \ No newline at end of file