Merge branch 'master' into backend

2020-05-28 12:02:36 +03:00
parent e52698ea16 6a0c5e0dd0
commit c2aa84f349
100 changed files with 4537 additions and 3689 deletions
--- a/src/datasource-zabbix/plugin.json
+++ b/src/datasource-zabbix/plugin.json
@@ -38,8 +38,8 @@
      "url": "https://github.com/alexanderzobnin/grafana-zabbix"
    },
    "logos": {
-      "small": "img/zabbix_app_logo.svg",
-      "large": "img/zabbix_app_logo.svg"
+      "small": "img/icn-zabbix-datasource.svg",
+      "large": "img/icn-zabbix-datasource.svg"
    }
  }
 }