diff options
| author | nicolargo <nicolashennion@gmail.com> | 2016-09-10 10:48:50 +0200 |
|---|---|---|
| committer | nicolargo <nicolashennion@gmail.com> | 2016-09-10 10:48:50 +0200 |
| commit | eaad5f5f3bbf468b2415d01fe55bcb54e3c16e27 (patch) | |
| tree | 966320793cfa503090e0cf7b661f5776196d53a5 /conf | |
| parent | bae43e926a98209061ad354b58863a5379d179ca (diff) | |
| parent | 59788e91adce777a2ca0d3187411a88925c82ed6 (diff) | |
Resolve merge conflicts with master branch
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/glances-grafana.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/conf/glances-grafana.json b/conf/glances-grafana.json index c614a3b6..24591bf5 100644 --- a/conf/glances-grafana.json +++ b/conf/glances-grafana.json @@ -759,7 +759,7 @@ [ { "params": [ - "enp0s25.rx" + "eth0.rx" ], "type": "field" }, @@ -775,7 +775,7 @@ }, { "alias": "Tx", - "column": "enp0s25.tx*-1", + "column": "eth0.tx*-1", "dsType": "influxdb", "function": "mean", "groupBy": [ @@ -800,7 +800,7 @@ [ { "params": [ - "enp0s25.tx" + "eth0.tx" ], "type": "field" }, |