Merge pull request #45 from chartwerk/ticks-time-interval-limit-#44

Ticks time interval limit #44

dist/README.md

@@ -1,38 +1,38 @@
-# Grafana Chartwerk Panel
+# Grafana Chartwerk Panel (beta)
 
-![image](https://user-images.githubusercontent.com/47055832/80608867-1b5f6c80-8a40-11ea-85c5-c9676a58b77a.png)
+<p align="center"><img src="https://user-images.githubusercontent.com/66464000/84520316-6c6fab00-ace4-11ea-9bfc-29ca73e5105e.png" width="150" height="150" /></div>
 
  **Grafana Chartwerk Panel** renders metrics using ChartWerk libraries. For now, it can render as a line and a series of bars. We are working on adding new visualizations.
 
+![image](https://user-images.githubusercontent.com/66464000/84491085-10416280-acb5-11ea-8af0-2761ed97aecc.png)
+![image](https://user-images.githubusercontent.com/66464000/84491069-0b7cae80-acb5-11ea-959b-ef67835c8055.png)
+
 ## Features
 
 - 2 types of visualizations:
   - line-chart
   - bar-chart
-- ability to make panel's time range independent of dashboard's.
+- ability to make panel's time range independent of dashboard's (doesn't work in Grafana 7).
 - ability to display template variables inside the panel.
 - "Charge" mode: green color for positive graph's slope, red color for negative graph's slope.
-- confidence interval.
+- confidence interval (for line).
 - customizable X-axis labels.
 - customizable grid interval.
 
-![image](https://user-images.githubusercontent.com/66464000/84491069-0b7cae80-acb5-11ea-959b-ef67835c8055.png)
-![image](https://user-images.githubusercontent.com/66464000/84491085-10416280-acb5-11ea-8af0-2761ed97aecc.png)
-
 ## Installation
-## On Linux
+### Linux / Mac OS X
 - Navigate to either: 
   - `<GRAFANA_PATH>/data/plugins` (when installed from tarball or source) 
   - or `/var/lib/grafana/plugins` (when installed from `.deb`/`.rpm` package)
 
 - Download ChartWerk panel
 ```
-wget https://github.com/chartwerk/grafana-chartwerk-panel/archive/master.zip
+wget https://github.com/chartwerk/grafana-chartwerk-panel/archive/0.1.1.zip
 ```
 
 - Unpack downloaded files
 ```
-unzip grafana-chartwerk-panel-master.zip
+unzip 0.1.1.zip
 ```
 
 - Restart grafana-server
@@ -43,12 +43,12 @@ unzip grafana-chartwerk-panel-master.zip
   - For grafana installed via Package Manager:
     - type in ```systemctl restart grafana-server```
 
-## Grafana in Docker
+### Grafana in Docker
 You can install ChartWerk panel to Grafana in Docker passing it as environment variable (as described in [Grafana docs](http://docs.grafana.org/installation/docker/#installing-plugins-from-other-sources))
 
 ```bash
 docker run \
   -p 3000:3000 \
-  -e "GF_INSTALL_PLUGINS=https://github.com/chartwerk/grafana-chartwerk-panel/archive/master.zip;corpglory-chartwerk-panel" \
+  -e "GF_INSTALL_PLUGINS=https://github.com/chartwerk/grafana-chartwerk-panel/archive/0.1.1.zip;corpglory-chartwerk-panel" \
   grafana/grafana
 ```

dist/partials/tab_axes.html

@@ -40,12 +40,18 @@
 </div>
 
 <div class="gf-form">
-  <label class="gf-form-label query-keyword width-12"> Time interval (minutes) </label>
+  <label class="gf-form-label query-keyword width-12"> Time interval </label>
   <input
     type="number"
-    class="gf-form-input width-12"
+    class="gf-form-input width-4"
     ng-model="ctrl.timeInterval"
     ng-blur="ctrl.onConfigChange()"
-    ng-max="60"
   >
+  <div class="gf-form-select-wrapper width-8 timeformat-selector">
+    <select class="gf-form-input"
+      ng-model="ctrl.timeFormat"
+      ng-options="format for format in ctrl.timeFormats"
+      ng-change="ctrl.onConfigChange()"
+    />
+  </div>
 </div>

dist/plugin.json

@@ -18,7 +18,7 @@
       "path": "assets/screenshots/main.png"
     }],
     "version": "0.1.1",
-    "updated": "2020-06-12"
+    "updated": "2020-06-18"
   },
   "dependencies": {
     "grafanaVersion": "6.6.1+",