Merge branch 'develop'

.gitignore

@@ -6,6 +6,24 @@
 *.bat
 
 # Grafana linter config
-.jshintrc
-.jscs.json
-.jsfmtrc
+# .jshintrc
+# .jscs.json
+# .jsfmtrc
+
+# Builded docs
+docs/site/
+
+node_modules
+npm-debug.log
+coverage/
+.aws-config.json
+awsconfig
+/emails/dist
+/public_gen
+/tmp
+vendor/phantomjs/phantomjs
+
+dist/
+
+# locally required config files
+public/css/*.min.css

.jscs.json

@@ -0,0 +1,13 @@
+{
+    "disallowImplicitTypeConversion": ["string"],
+    "disallowKeywords": ["with"],
+    "disallowMultipleLineBreaks": true,
+    "disallowMixedSpacesAndTabs": true,
+    "disallowTrailingWhitespace": true,
+    "requireSpacesInFunctionExpression": {
+        "beforeOpeningCurlyBrace": true
+    },
+    "disallowSpacesInsideArrayBrackets": true,
+    "disallowSpacesInsideParentheses": true,
+    "validateIndentation": 2
+}

.jshintrc

@@ -0,0 +1,39 @@
+{
+  "browser": true,
+
+  "bitwise":false,
+  "curly": true,
+  "eqnull": true,
+  "strict": true,
+  "module": true,
+  "devel": true,
+  "eqeqeq": true,
+  "forin": false,
+  "immed": true,
+  "supernew": true,
+  "expr": true,
+  "indent": 2,
+  "latedef": false,
+  "newcap": true,
+  "noarg": true,
+  "noempty": true,
+  "undef": true,
+  "boss": true,
+  "trailing": true,
+  "laxbreak": true,
+  "laxcomma": true,
+  "sub": true,
+  "unused": true,
+  "maxdepth": 6,
+  "maxlen": 140,
+  "esnext": true,
+
+  "globals": {
+    "System": true,
+    "Promise": true,
+    "define": true,
+    "require": true,
+    "Chromath": false,
+    "setImmediate": true
+  }
+}

CONTRIBUTING.md

@@ -0,0 +1 @@
+# Contributing to Grafana-Zabbix

Gruntfile.js

@@ -0,0 +1,82 @@
+module.exports = function(grunt) {
+
+  require('load-grunt-tasks')(grunt);
+
+  grunt.loadNpmTasks('grunt-execute');
+  grunt.loadNpmTasks('grunt-contrib-clean');
+
+  grunt.initConfig({
+
+    clean: ["dist"],
+
+    copy: {
+      src_to_dist: {
+        cwd: 'src',
+        expand: true,
+        src: [
+          '**/*',
+          '!datasource-zabbix/*.js',
+          '!panel-triggers/*.js',
+          '!components/*.js',
+          '!module.js',
+          '!**/*.scss'
+        ],
+        dest: 'dist/'
+      },
+      pluginDef: {
+        expand: true,
+        src: ['plugin.json', 'README.md'],
+        dest: 'dist/',
+      }
+    },
+
+    watch: {
+      rebuild_all: {
+        files: ['src/**/*', 'plugin.json'],
+        tasks: ['default'],
+        options: {spawn: false}
+      },
+    },
+
+    babel: {
+      options: {
+        sourceMap: true,
+        presets:  ["es2015"],
+        plugins: ['transform-es2015-modules-systemjs', "transform-es2015-for-of"],
+      },
+      dist: {
+        files: [{
+          cwd: 'src',
+          expand: true,
+          src: [
+            'datasource-zabbix/*.js',
+            'panel-triggers/*.js',
+            'components/*.js',
+            'module.js',
+          ],
+          dest: 'dist/'
+        }]
+      },
+    },
+
+    sass: {
+      options: {
+        sourceMap: true
+      },
+      dist: {
+        files: {
+          'dist/panel-triggers/css/panel_triggers.css' : 'src/panel-triggers/sass/panel_triggers.scss',
+        }
+      }
+    }
+
+  });
+
+  grunt.registerTask('default', [
+    'clean',
+    'copy:src_to_dist',
+    'copy:pluginDef',
+    'babel',
+    'sass'
+  ]);
+};

README.md

@@ -1,46 +1,36 @@
-# Grafana-Zabbix
+# Zabbix plugin for Grafana
 
-#### Zabbix datasource for Grafana dashboard
+Zabbix datasource, Triggers panel and more.
 
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/alexanderzobnin/grafana-zabbix?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
-##### [Donate](https://www.paypal.me/alexanderzobnin)
-
 ##### See features overview and dashboards examples at Grafana-Zabbix [Live demo](http://play.grafana-zabbix.org) site.
 
 ##### Download [latest release](https://github.com/alexanderzobnin/grafana-zabbix/releases/latest)
 
-Display your Zabbix data directly in [Grafana](http://grafana.org) dashboards!
+### Meet grafana-zabbix 3.0
+Download [grafana-zabbix 3.0 beta](https://github.com/alexanderzobnin/grafana-zabbix/releases/latest)
 
-![Dashboard](https://cloud.githubusercontent.com/assets/4932851/8269101/9e6ee67e-17a3-11e5-85de-fe9dcc2dd375.png)
+[Documentation](http://docs.grafana-zabbix.org)  
+Read [installation instruction](http://docs.grafana-zabbix.org/installation/) for version 3.0.
+
+Display your Zabbix data with powerful [Grafana](http://grafana.org) dashboards!
 
-#### [Documentation](https://github.com/alexanderzobnin/grafana-zabbix/wiki)
-1. [**Overview**](https://github.com/alexanderzobnin/grafana-zabbix/wiki/Overview)
-2. [**Installation**](https://github.com/alexanderzobnin/grafana-zabbix/wiki/Installation#grafana-21x-and-25x)
-3. [**User’s Guide**](https://github.com/alexanderzobnin/grafana-zabbix/wiki/Usage)
-4. [**Troubleshooting**](https://github.com/alexanderzobnin/grafana-zabbix/wiki/Troubleshooting)
+![Dashboard](https://cloud.githubusercontent.com/assets/4932851/8269101/9e6ee67e-17a3-11e5-85de-fe9dcc2dd375.png)
 
 ## Features
 
 #### Flexible metric editor
  * hosts and items filtering:
-
-[![regex_filter](https://cloud.githubusercontent.com/assets/4932851/8312766/5eb34480-19e7-11e5-925f-452a99ec0ab6.gif)](https://cloud.githubusercontent.com/assets/4932851/8312766/5eb34480-19e7-11e5-925f-452a99ec0ab6.gif)
-
- * Custom scale for each target:
-
-![Scale](https://cloud.githubusercontent.com/assets/4932851/8269207/212549be-17a9-11e5-9e33-90deb90ddc13.png)
+ * Custom scale for each target
 
 #### Templated dashboards support
 Group, host, application or item names can be replaced with a template variable. This allows you to create generic dashboards that can quickly be changed to show stats for a specific cluster, server or application.
 
-[![templated_dashboard](https://cloud.githubusercontent.com/assets/4932851/8312492/7f286c38-19e5-11e5-8c19-1b9e97292b06.gif)](https://cloud.githubusercontent.com/assets/4932851/8312492/7f286c38-19e5-11e5-8c19-1b9e97292b06.gif)
 
 #### Annotations support
- * Display zabbix events on graphs:
-![Annotations](https://cloud.githubusercontent.com/assets/4932851/8269358/622ec3be-17ad-11e5-8023-eba137369cfe.png)
- * Show acknowledges for problems:  
-![Acknowledges](https://cloud.githubusercontent.com/assets/4932851/8269375/e6d8706a-17ad-11e5-8e2d-2d707d8ee67f.png)
+ * Display zabbix events on graphs
+ * Show acknowledges for problems
 
 ### Dockerized Grafana with Zabbix datasource
 

docs/README.md

@@ -0,0 +1 @@
+# Grafana-Zabbix Documentation

docs/mkdocs.yml

@@ -0,0 +1,25 @@
+site_name: Grafana-Zabbix Documentation
+#site_url: http://docs.grafana-zabbix.org/
+#site_url: /
+site_description: Documentation for Grafana-Zabbix, Zabbix monitoring system plugin bundle for Grafana
+repo_url: https://github.com/alexanderzobnin/grafana-zabbix/
+copyright: Copyright © 2014-2015, Alexander Zobnin
+
+docs_dir: sources
+theme: readthedocs
+
+pages:
+- Project:
+    - 'About Grafana-Zabbix': 'index.md'
+    - 'Feature Highlights': 'features.md'
+- Installation:
+    - 'Installation': 'installation/index.md'
+    - 'Configuration': 'installation/configuration.md'
+    - 'Troubleshooting': 'installation/troubleshooting.md'
+- User Guides:
+    - 'Getting Started': 'guides/gettingstarted.md'
+- Reference:
+    - 'Zabbix Datasource': 'reference/datasource-zabbix.md'
+    - 'Triggers Panel': 'reference/panel-triggers.md'
+- Tutorials:
+    - 'Building Host Dashboard': 'tutorials/host_dashboard.md'

docs/sources/features.md

@@ -0,0 +1,11 @@
+page_title: Feature Highlights
+page_description: Grafana-Zabbix Feature Highlights.
+
+# Feature Highlights
+
+Grafana in couple with Grafana-Zabbix plugin allows to create great dashboards. There is some
+features:
+
+- Rich graphing with Grafana
+- Template variables allow to create reusable dashboards
+

docs/sources/guides/gettingstarted.md

@@ -0,0 +1,3 @@
+# Getting Started with Grafana-Zabbix
+After you [installed and configured](../installation/index.md) Grafana-Zabbix data source let's
+create a simple dashboard.

docs/sources/img/.gitattributes

@@ -0,0 +1,3 @@
+*.png filter=lfs diff=lfs merge=lfs -text
+*.jpg filter=lfs diff=lfs merge=lfs -text
+*.psd filter=lfs diff=lfs merge=lfs -text

docs/sources/index.md

@@ -0,0 +1,38 @@
+page_title: About Grafana-Zabbix
+page_description: Introduction to Grafana-Zabbix plugin.
+
+# About Grafana-Zabbix plugin
+
+Grafana-Zabbix is a plugin for Grafana allowing to visualize monitoring data from Zabbix
+and create dashboards for analyzing metrics and realtime monitoring. Main goals of this project
+are extend Zabbix capabilities for monitoring data visualization and provide quick and powerful way
+to create dashboards. It is possible due both Grafana and Grafana-Zabbix plugin features.
+
+## Community Resources, Feedback, and Support
+
+This project is being started as a simple plugin for Grafana. But many powerful features and
+improvements come from community. So don't hesitate to give any feedback and together we will make
+this tool better.
+
+If you have any troubles with Grafana or you just want clarification on a feature, there are
+a number of ways to get help:
+
+- [Troubleshooting guide](/installation/troubleshooting/)
+- Search closed and open [issues on GitHub](https://github.com/grafana/grafana/issues)
+- [Gitter room](https://gitter.im/alexanderzobnin/grafana-zabbix)
+- [Twitter](https://twitter.com/AlexanderZobnin)
+
+Or you can just send me [email](mailto:[email protected]).
+
+## Support Project
+I develop this project in my free time, but if you really find it helpful and promising, you can
+support me. There are some ways to do this. You can [donate](https://www.paypal.me/alexanderzobnin) 
+any reasonable amount, or you can request a feature development, interesting for you (for example, 
+Triggers panel was sponsored by [Core IT Project](http://coreit.fr/)).
+
+## License
+
+By utilizing this software, you agree to the terms of the included license. Grafana-Zabbix plugin is
+licensed under the Apache 2.0 agreement. See
+[LICENSE](https://github.com/alexanderzobnin/grafana-zabbix/blob/master/LICENSE.md) for the full
+license terms.