diff options
author | Matthias Runge <mrunge@redhat.com> | 2019-12-17 14:42:39 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2019-12-17 14:42:39 +0000 |
commit | aaefdd5faa4433a016785effc662cea060d46862 (patch) | |
tree | 9d5e9a24ec7e4a731e51ecc97ceca3a8eedc4734 /docker/barometer-grafana | |
parent | 4d100488be83a24e9e5b80b38c39681e9b1df970 (diff) | |
parent | 4abee7e46d1602f796f8aebed0a51da9476d0832 (diff) |
Merge "Updates/Fix on Legal/License Headers"
Diffstat (limited to 'docker/barometer-grafana')
-rw-r--r-- | docker/barometer-grafana/Dockerfile | 15 | ||||
-rwxr-xr-x | docker/barometer-grafana/dashboards/configure_grafana.sh | 6 |
2 files changed, 19 insertions, 2 deletions
diff --git a/docker/barometer-grafana/Dockerfile b/docker/barometer-grafana/Dockerfile index 610e8086..714f95ae 100644 --- a/docker/barometer-grafana/Dockerfile +++ b/docker/barometer-grafana/Dockerfile @@ -1,3 +1,18 @@ +# Copyright 2017-2019 Intel Corporation and OPNFV. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + FROM grafana/grafana:4.6.3 ENV grafana_folder /opt/grafana diff --git a/docker/barometer-grafana/dashboards/configure_grafana.sh b/docker/barometer-grafana/dashboards/configure_grafana.sh index 8ce9689b..9089f832 100755 --- a/docker/barometer-grafana/dashboards/configure_grafana.sh +++ b/docker/barometer-grafana/dashboards/configure_grafana.sh @@ -1,16 +1,18 @@ -# Copyright 2017 OPNFV +# Copyright 2017-2019 Intel Corporation and OPNFV. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# + curl -u admin:admin -X POST -H 'content-type: application/json'\ http://127.0.0.1:3000/api/datasources -d \ '{"name":"collectd","type":"influxdb","url":"http://localhost:8086","access":"proxy","isDefault":true,"database":"collectd","user":"admin","password":"admin","basicAuth":false}' |