Merge branch 'master' into centreon

centreon · Jun 4, 2020 · 808a210 · 808a210
2 parents b1f5d0a + 3d1fc8c
commit 808a210
Show file tree

Hide file tree

Showing 21 changed files with 1,160 additions and 101,509 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -3,6 +3,7 @@ module.exports = (grunt) => {
 
   grunt.loadNpmTasks('grunt-execute');
   grunt.loadNpmTasks('grunt-contrib-clean');
+  grunt.loadNpmTasks('grunt-contrib-watch');
   grunt.loadNpmTasks('grunt-sass');
 
   grunt.initConfig({

diff --git a/README.md b/README.md
@@ -13,6 +13,22 @@ This is a Grafana panel plugin that provides a way to create flow-charts, sequen
 
 **Note - Special characters in an alias are replace with an underscore. See character replacement below
 
+## Development
+
+For easy development, use the `docker-compose.yml`.
+
+In a terminal - 
+`docker-compose up -d`
+Grafana will start on port 3000 with user/pass = `admin`  
+The plugin project will be mounted inside the docker container so changes are reflected immediately.  
+Add a new dashboard with the diagram plugin to test changes.  
+
+`npm run watch`  
+The diagram plugin will watch for changes in the project, and rebuild.  
+
+Open the plugin files in your favorite editor and make changes.  
+Refresh your browser to see the diagram plugin changes.  
+
 ## Character Replacement
 
 The following characters in metric names are automatically replaced with an underscore.

diff --git a/dist/README.md b/dist/README.md
@@ -13,6 +13,22 @@ This is a Grafana panel plugin that provides a way to create flow-charts, sequen
 
 **Note - Special characters in an alias are replace with an underscore. See character replacement below
 
+## Development
+
+For easy development, use the `docker-compose.yml`.
+
+In a terminal - 
+`docker-compose up -d`
+Grafana will start on port 3000 with user/pass = `admin`  
+The plugin project will be mounted inside the docker container so changes are reflected immediately.  
+Add a new dashboard with the diagram plugin to test changes.  
+
+`npm run watch`  
+The diagram plugin will watch for changes in the project, and rebuild.  
+
+Open the plugin files in your favorite editor and make changes.  
+Refresh your browser to see the diagram plugin changes.  
+
 ## Character Replacement
 
 The following characters in metric names are automatically replaced with an underscore.

diff --git a/dist/css/diagram.css b/dist/css/diagram.css
diff --git a/dist/css/diagram.css.map b/dist/css/diagram.css.map