Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

DS config: add help for Direct DB Connection

Browse Source
This commit is contained in:
Alexander Zobnin
2017-07-22 22:11:58 +03:00
parent e5f936c0cb
commit 9e6a7f60b9
2 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dist/datasource-zabbix/partials/config.html vendored
View File

@@ -77,13 +77,22 @@
<div class="gf-form-group"> <div class="gf-form-group">
<h3 class="page-heading">Direct DB Connection</h3> <h3 class="page-heading">Direct DB Connection</h3>
<gf-form-switch class="gf-form" label-class="width-9" <gf-form-switch class="gf-form" label-class="width-12"
label="Enable" label="Enable"
checked="ctrl.current.jsonData.dbConnection.enable"> checked="ctrl.current.jsonData.dbConnection.enable">
</gf-form-switch> </gf-form-switch>
<div ng-if="ctrl.current.jsonData.dbConnection.enable"> <div ng-if="ctrl.current.jsonData.dbConnection.enable">
<div class="gf-form max-width-20"> <div class="gf-form max-width-20">
<span class="gf-form-label width-9">SQL Data Source</span> <span class="gf-form-label width-12">
SQL Data Source
<info-popover mode="right-normal">
Select SQL Data Source for Zabbix database.
In order to use this feature you should <a href="/datasources/new" target="_blank">create</a> and
configure it first. Zabbix plugin uses this data source for querying history data directly from database.
This way usually faster than pulling data from Zabbix API, especially on the wide time ranges, and reduces
amount of data transfered.
</info-popover>
</span>
<div class="gf-form-select-wrapper max-width-16"> <div class="gf-form-select-wrapper max-width-16">
<select class="gf-form-input" ng-model="ctrl.current.jsonData.dbConnection.datasourceId" <select class="gf-form-input" ng-model="ctrl.current.jsonData.dbConnection.datasourceId"
ng-options="ds.id as ds.name for ds in ctrl.sqlDataSources"> ng-options="ds.id as ds.name for ds in ctrl.sqlDataSources">
@@ -95,17 +104,17 @@
<div class="gf-form-group"> <div class="gf-form-group">
<h3 class="page-heading">Alerting</h3> <h3 class="page-heading">Alerting</h3>
<gf-form-switch class="gf-form" label-class="width-9" <gf-form-switch class="gf-form" label-class="width-12"
label="Enable alerting" label="Enable alerting"
checked="ctrl.current.jsonData.alerting"> checked="ctrl.current.jsonData.alerting">
</gf-form-switch> </gf-form-switch>
<div ng-if="ctrl.current.jsonData.alerting"> <div ng-if="ctrl.current.jsonData.alerting">
<gf-form-switch class="gf-form" label-class="width-9" <gf-form-switch class="gf-form" label-class="width-12"
label="Add thresholds" label="Add thresholds"
checked="ctrl.current.jsonData.addThresholds"> checked="ctrl.current.jsonData.addThresholds">
</gf-form-switch> </gf-form-switch>
<div class="gf-form max-width-20"> <div class="gf-form max-width-20">
<span class="gf-form-label width-9">Min severity</span> <span class="gf-form-label width-12">Min severity</span>
<div class="gf-form-select-wrapper max-width-16"> <div class="gf-form-select-wrapper max-width-16">
<select class="gf-form-input" ng-model="ctrl.current.jsonData.alertingMinSeverity" <select class="gf-form-input" ng-model="ctrl.current.jsonData.alertingMinSeverity"
ng-options="s.val as s.text for s in [ ng-options="s.val as s.text for s in [

19
src/datasource-zabbix/partials/config.html
View File

@@ -77,13 +77,22 @@
<div class="gf-form-group"> <div class="gf-form-group">
<h3 class="page-heading">Direct DB Connection</h3> <h3 class="page-heading">Direct DB Connection</h3>
<gf-form-switch class="gf-form" label-class="width-9" <gf-form-switch class="gf-form" label-class="width-12"
label="Enable" label="Enable"
checked="ctrl.current.jsonData.dbConnection.enable"> checked="ctrl.current.jsonData.dbConnection.enable">
</gf-form-switch> </gf-form-switch>
<div ng-if="ctrl.current.jsonData.dbConnection.enable"> <div ng-if="ctrl.current.jsonData.dbConnection.enable">
<div class="gf-form max-width-20"> <div class="gf-form max-width-20">
<span class="gf-form-label width-9">SQL Data Source</span> <span class="gf-form-label width-12">
SQL Data Source
<info-popover mode="right-normal">
Select SQL Data Source for Zabbix database.
In order to use this feature you should <a href="/datasources/new" target="_blank">create</a> and
configure it first. Zabbix plugin uses this data source for querying history data directly from database.
This way usually faster than pulling data from Zabbix API, especially on the wide time ranges, and reduces
amount of data transfered.
</info-popover>
</span>
<div class="gf-form-select-wrapper max-width-16"> <div class="gf-form-select-wrapper max-width-16">
<select class="gf-form-input" ng-model="ctrl.current.jsonData.dbConnection.datasourceId" <select class="gf-form-input" ng-model="ctrl.current.jsonData.dbConnection.datasourceId"
ng-options="ds.id as ds.name for ds in ctrl.sqlDataSources"> ng-options="ds.id as ds.name for ds in ctrl.sqlDataSources">
@@ -95,17 +104,17 @@
<div class="gf-form-group"> <div class="gf-form-group">
<h3 class="page-heading">Alerting</h3> <h3 class="page-heading">Alerting</h3>
<gf-form-switch class="gf-form" label-class="width-9" <gf-form-switch class="gf-form" label-class="width-12"
label="Enable alerting" label="Enable alerting"
checked="ctrl.current.jsonData.alerting"> checked="ctrl.current.jsonData.alerting">
</gf-form-switch> </gf-form-switch>
<div ng-if="ctrl.current.jsonData.alerting"> <div ng-if="ctrl.current.jsonData.alerting">
<gf-form-switch class="gf-form" label-class="width-9" <gf-form-switch class="gf-form" label-class="width-12"
label="Add thresholds" label="Add thresholds"
checked="ctrl.current.jsonData.addThresholds"> checked="ctrl.current.jsonData.addThresholds">
</gf-form-switch> </gf-form-switch>
<div class="gf-form max-width-20"> <div class="gf-form max-width-20">
<span class="gf-form-label width-9">Min severity</span> <span class="gf-form-label width-12">Min severity</span>
<div class="gf-form-select-wrapper max-width-16"> <div class="gf-form-select-wrapper max-width-16">
<select class="gf-form-input" ng-model="ctrl.current.jsonData.alertingMinSeverity" <select class="gf-form-input" ng-model="ctrl.current.jsonData.alertingMinSeverity"
ng-options="s.val as s.text for s in [ ng-options="s.val as s.text for s in [