Feature to create new dashboard in grafana #1

rishubhjain · 2017-07-27T09:42:15Z

Create new dashboard in grafana.
Updated README.md

rishubhjain · 2017-07-31T13:45:21Z

@anivargi @r0h4n @GowthamShanmugam @cloudbehl Please review

GowthamShanmugam · 2017-08-01T08:42:19Z

tendrl/monitoring-integration/__init__.py

@@ -0,0 +1,66 @@
+import __builtin__


folder name should be monitoring_integration

TimothyAsir · 2017-08-01T18:42:42Z

Please link the corresponding spec no

GowthamShanmugam · 2017-08-02T05:54:22Z

README.rst

+
+ ::
+
+ $ cp tendrl/monitoring_integration/grafana/grafana.ini /etc/grafana/.


why you are maintaining grafana.ini in monitoring-integration and copying it to /etc/grafana/, Instead of that mention what is the changes in wants to do in /etc/grafana/grafana.ini

There are few changes in grafana.ini which are system independent and requires no inputs from user. So in my opinion copying the file directly is a better approach

TimothyAsirJeyasing · 2017-08-02T07:55:37Z

Few changes required for packaging prospective:

Use /etc/tendrl/monitoring_integration path for grafana.conf.yml
Use entrypoint in setup.py to avoid using python init.py execution.
rishubhjain@52d3c5a

r0h4n · 2017-08-02T06:52:45Z

tendrl/monitoring_integration/grafana/grafana.ini

@@ -0,0 +1,407 @@
+##################### Grafana Configuration Example #####################


Move this file to etc/grafana/grafana.ini from tendrl/monitoring_integration/grafana/grafana.ini in this repo

Also move all screenshots to etc/grafana/screenshots/ in this repo

r0h4n · 2017-08-02T08:09:29Z

setup.py

+ "Development Status :: 4 - Beta"
+ ],
+ zip_safe=False,
+ install_requires=[


please explain more @GowthamShanmugam

r0h4n · 2017-08-02T08:33:35Z

grafana.conf.yml

+ user: admin
+ password: admin
+
+port: 3000


Since we are assuming that grafana service will always run on tendrl-server (with API, etcd), we dont need to allow configurable port and host

cc @Tendrl/tendrl-core , @anivargi @anmolbabu

r0h4n · 2017-08-02T08:34:06Z

graphite.conf.sample.yml

+
+type: graphite
+
+host: '127.0.0.1'


Since we are assuming that graphite service will always run on tendrl-server (with API, etcd), we dont need to allow configurable port and host

cc @Tendrl/tendrl-core , @anivargi @anmolbabu

r0h4n · 2017-08-02T08:34:26Z

graphite.conf.sample.yml

+basicAuth: false
+
+isDefault: true
+


remove unused options

r0h4n · 2017-08-02T09:59:57Z

tendrl/monitoring_integration/grafana/connection.py

@@ -0,0 +1,60 @@
+import os


this file should be called "tendrl/monitoring_integration/grafana/utils.py" instead of connection.py

r0h4n · 2017-08-02T10:05:06Z

tendrl/monitoring_integration/grafana/connection.py

+import os
+import yaml
+import socket
+from grafana.exceptions import ConfigNotFoundException


from tendrl.monitoring_integration.grafana import exceptions

then use
exceptions.ConfigNotFoundException

r0h4n · 2017-08-02T10:11:47Z

tendrl/monitoring_integration/__init__.py

@@ -0,0 +1,75 @@
+import __builtin__


fix imports as per below comments on other files

r0h4n · 2017-08-02T10:27:31Z

tendrl/monitoring_integration/__init__.py

+def main():
+
+ dashboards = []
+ config = get_conf("../../grafana.conf.yml")


Based on my comment below, you will now need to load the "/etc/tendrl/monitoring-integration/monitoring-integration.conf.yml" instead of loading ../../grafana.conf.yml and graphite.conf.yml

r0h4n · 2017-08-02T10:29:01Z

tendrl/monitoring_integration/__init__.py

+ response_status = []
+
+ for datasource in config.datasource:
+ datasource_config = get_conf("../../" + str(datasource) + ".conf.yml")


If this is loading graphite.conf.yml, please remove it and use /etc/monitoring-integration/monitoring-integration.conf.yml

nthomas-redhat · 2017-08-03T02:32:09Z

README.rst

+
+* Grafana instance is set-up and running on the server node.
+
+* Graphite instance in set-up and running on the same server node.


@rishubhjain @anivargi @anmolbabu , Now graphite is dependency to monitoring-integration, I think we need have the below config files part of this:

https://github.com/Tendrl/performance-monitoring/blob/master/etc/tendrl/performance-monitoring/graphite-web.conf.sample

https://github.com/Tendrl/performance-monitoring/blob/master/etc/tendrl/performance-monitoring/carbon.conf.sample

What you guys think?

r0h4n

+pep8 fixes required

r0h4n · 2017-08-03T06:32:20Z

tendrl/monitoring_integration/grafana/datasource.py

+''' Create Datasource '''
+
+
+def post_datasource(datasource_json):


Make post_datasource private method then (_post_datasource)

r0h4n · 2017-08-03T06:34:49Z

tendrl/monitoring_integration/grafana/dashboard.py

@@ -0,0 +1,96 @@
+import __builtin__


convert methods that are used only in this file as private methods

r0h4n · 2017-08-03T06:52:49Z

README.rst

+
+* Development setup
+
+ * Create a json file in tendrl/monitoring-integration/grafana/dashboards and provide json


I would prefer to have the dashboards at /etc/tendrl/monitoring-integration/grafana/dashboards/

r0h4n · 2017-08-03T06:58:40Z

etc/tendrl/monitoring-integration/graphite-web.conf.sample

@@ -0,0 +1,42 @@
+# Graphite Web Basic mod_wsgi vhost


etc/tendrl/monitoring-integration/graphite/graphite-web.conf.sample

r0h4n · 2017-08-03T07:13:56Z

tendrl/monitoring_integration/__init__.py

+ sys.stdout.write('\n' + "Dashboard " + str(dashboard_json) +
+ " already exists" + '\n')
+ continue
+ response = dashboard.create_dashboard(dashboard_json)


pass dashboard dir as "/etc/tendrl/grafana/dashboards" to create dashboard

nthomas-redhat · 2017-08-03T07:52:04Z

tendrl/monitoring_integration/grafana/dashboard.py

+ response = post_dashboard(dashboard_json)
+ return response
+
+ except exceptions.ConnectionFailedException:


exceptions from post if any? Applicable whereever python-requests(post,get etc) are used

Before making a post request I am checking if the port is open and handling exceptions during this check.
Will an additional exception handling required during post requests?
In my opinion if the port is open, and if there is any error in request then it will be received as a response instead of exception

nthomas-redhat · 2017-08-03T08:03:13Z

tendrl/monitoring_integration/__init__.py

+ sys.stdout.write('\n' + "Dashboard " + str(dashboard_json) +
+ " already exists" + '\n')
+ continue
+ response = dashboard.create_dashboard(dashboard_json)


In the spec, we were talking about copying the json files only first time. Further it will be skipped. Where this is implemented?

dashboards = dashboard.get_all_dashboards()

title = [] for dashboard_json in dashboards: title.append(dashboard_json["uri"].split('/')[1]) for dashboard_json in config.dashboards: if dashboard_json in title: sys.stdout.write('\n' + "Dashboard " + str(dashboard_json) + " already exists" + '\n') continue

@nthomas-redhat this code is in https://github.com/Tendrl/monitoring-integration/pull/1/files#diff-97e77c10061c204a40b034cfd2d171b4R32

cloudbehl · 2017-08-03T09:00:14Z

README.rst

+
+* Grafana instance is set-up and running on the server node.
+
+* Graphite instance in set-up and running on the same server node.


@rishubhjain /s/Graphite instance in/Graphite instance is

r0h4n · 2017-08-03T09:08:20Z

@Tendrl/tendrl-core please approve

rishubhjain force-pushed the feature/create_new_dashboard branch 29 times, most recently from e284965 to f8c8ad3 Compare July 31, 2017 11:57

GowthamShanmugam reviewed Aug 1, 2017

View reviewed changes

rishubhjain force-pushed the feature/create_new_dashboard branch 8 times, most recently from f26873d to bfe6bac Compare August 1, 2017 16:29

rishubhjain force-pushed the feature/create_new_dashboard branch from bfe6bac to 3b2de67 Compare August 1, 2017 19:06

GowthamShanmugam reviewed Aug 2, 2017

View reviewed changes

r0h4n suggested changes Aug 2, 2017

View reviewed changes

rishubhjain force-pushed the feature/create_new_dashboard branch 2 times, most recently from e1447eb to 96be3b8 Compare August 2, 2017 15:20

nthomas-redhat mentioned this pull request Aug 2, 2017

Add build scripts for packaging tendrl-monitoring-integration rishubhjain/monitoring-integration#2

Closed

nthomas-redhat requested changes Aug 3, 2017

View reviewed changes

rishubhjain force-pushed the feature/create_new_dashboard branch from 96be3b8 to 245e28d Compare August 3, 2017 06:16

r0h4n suggested changes Aug 3, 2017

View reviewed changes

nthomas-redhat requested changes Aug 3, 2017

View reviewed changes

rishubhjain force-pushed the feature/create_new_dashboard branch from 245e28d to 28c28ee Compare August 3, 2017 08:29

cloudbehl suggested changes Aug 3, 2017

View reviewed changes

r0h4n approved these changes Aug 3, 2017

View reviewed changes

rishubhjain force-pushed the feature/create_new_dashboard branch from 28c28ee to 15fcc4f Compare August 3, 2017 09:09

Feature to create new dashboard in grafana

c4a8b6d

rishubhjain force-pushed the feature/create_new_dashboard branch from 15fcc4f to c4a8b6d Compare August 3, 2017 09:10

nthomas-redhat approved these changes Aug 3, 2017

View reviewed changes

r0h4n merged commit 8701e0c into Tendrl:master Aug 3, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature to create new dashboard in grafana #1

Feature to create new dashboard in grafana #1

rishubhjain commented Jul 27, 2017

rishubhjain commented Jul 31, 2017

GowthamShanmugam Aug 1, 2017

TimothyAsir commented Aug 1, 2017

GowthamShanmugam Aug 2, 2017

rishubhjain Aug 2, 2017

TimothyAsirJeyasing commented Aug 2, 2017

r0h4n Aug 2, 2017

r0h4n Aug 2, 2017

r0h4n Aug 2, 2017

r0h4n Aug 2, 2017

r0h4n Aug 2, 2017

r0h4n Aug 2, 2017

r0h4n Aug 2, 2017

r0h4n Aug 2, 2017

r0h4n Aug 2, 2017

r0h4n Aug 2, 2017

nthomas-redhat Aug 3, 2017

r0h4n left a comment

r0h4n Aug 3, 2017

r0h4n Aug 3, 2017

r0h4n Aug 3, 2017

r0h4n Aug 3, 2017

r0h4n Aug 3, 2017

nthomas-redhat Aug 3, 2017

rishubhjain Aug 3, 2017 •

edited

Loading

nthomas-redhat Aug 3, 2017

GowthamShanmugam Aug 3, 2017

GowthamShanmugam Aug 3, 2017 •

edited

Loading

nthomas-redhat Aug 3, 2017

cloudbehl Aug 3, 2017

rishubhjain Aug 3, 2017

r0h4n commented Aug 3, 2017


		::

		$ cp tendrl/monitoring_integration/grafana/grafana.ini /etc/grafana/.

		@@ -0,0 +1,407 @@
		##################### Grafana Configuration Example #####################


		* Grafana instance is set-up and running on the server node.

		* Graphite instance in set-up and running on the same server node.

		''' Create Datasource '''


		def post_datasource(datasource_json):


		* Development setup

		* Create a json file in tendrl/monitoring-integration/grafana/dashboards and provide json


		type: graphite

		host: '127.0.0.1'

		basicAuth: false

		isDefault: true

Feature to create new dashboard in grafana #1

Feature to create new dashboard in grafana #1

Conversation

rishubhjain commented Jul 27, 2017

rishubhjain commented Jul 31, 2017

Choose a reason for hiding this comment

TimothyAsir commented Aug 1, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TimothyAsirJeyasing commented Aug 2, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

r0h4n left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rishubhjain Aug 3, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

GowthamShanmugam Aug 3, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

r0h4n commented Aug 3, 2017

rishubhjain Aug 3, 2017 •

edited

Loading

GowthamShanmugam Aug 3, 2017 •

edited

Loading