summaryrefslogtreecommitdiffstats
path: root/docker
AgeCommit message (Collapse)AuthorFilesLines
2018-11-12src, docker: Change pkg import path of DMAToshiaki Takahashi1-6/+4
Different repository from OPNFV repository was temporary used as our own go package paths of DMA. Since the DMA code was merged in OPNFV Barometer, we change the import path to the Barometer repository and we simplify Dockerfile. Change-Id: I49aba163d3bd93a9edb48ce10bd4f69a43c2e28a Signed-off-by: Toshiaki Takahashi <takahashi.tsc@ncos.nec.co.jp> (cherry picked from commit 354e06c7edcb9434d55c06bfab4de157f0e2d012)
2018-11-09dashboards: update and fix grafana dashboardsKamil Wiatrowski10-13031/+7411
Update of default grafana dashboards. Change-Id: I049001c982c19500d367bcaf467a9c614605792a Signed-off-by: Kamil Wiatrowski <kamilx.wiatrowski@intel.com> (cherry picked from commit f2f22010d7d382fcb2c3e5b3bfd5f5c5602b28ab)
2018-11-09ansible: Set IP address of influxdb for grafanaKamil Wiatrowski2-8/+5
Set ip address to influxdb for grafana based on provided hostname. IP address in numerical format is required by grafana container. Mapping of hostname in /etc/hosts is no longer required. Change-Id: I684de737c6f8e48b5b9f256541901852d7ecc05a Signed-off-by: Kamil Wiatrowski <kamilx.wiatrowski@intel.com> (cherry picked from commit 3e269c4c295e3dd81dfeaebe9de4c4a702e7f1d5)
2018-11-09ansible: Add cleanup for grafana cache under host machineRadoslaw Jablonski1-0/+6
Previously cleaning cache directory for grafana(/var/lib/grafana) was missing and, because of that, changing influxdb_host variable value between one ansible deployment and another was not working. It was a problem because scripts in grafana container are expecting that cache directory will be empty during first run and, if some dashboards exists in cache already (even if they are left by previous deployment), old dashboards will be left untouched with possibly wrong configuration. This bug happened during deploying 3 nodes scenarios more than once (collectd, grafana and influlxdb hosted on separate machines). Now cleanup is done by default and can be skipped using 'clean_grafana_cache=false' value. Change-Id: Ib67cc3437b8a3a2c2930dd55cba44aef8e352cf2 Signed-off-by: Radoslaw Jablonski <radoslawx.jablonski@intel.com> (cherry picked from commit 1ff5c221b795245cd77fff9b2d0387b7146f8fe9)
2018-11-09ansible: Fix custom 'influxdb_host' setting for grafanaRadoslaw Jablonski1-2/+5
Previously there were 2 errors in ansible scripts for grafana: - influxdb_host variable value was unset - entry for /etc/hosts file was adding text "{{ influxdb_hostname }}" instead hostname stored in this variable Change-Id: I1821b3c5f5fea5c29386b1a57e37aadcf90dd2e6 Signed-off-by: Radoslaw Jablonski <radoslawx.jablonski@intel.com> (cherry picked from commit 659840a7d99ecbacd767c10395a47615af415e63)
2018-10-05Merge "Add role to auto install docker on hosts - missing patch"Aaron Smith3-3/+8
2018-10-04Add role to auto install docker on hosts - missing patchKamil Wiatrowski3-3/+8
Small updates to ansible roles. Several minor updates in documentation. Change-Id: Id031cebc23301b6218f8ced0d261f844f270e37f Signed-off-by: Kamil Wiatrowski <kamilx.wiatrowski@intel.com>
2018-10-03Adding support for prometheus using ansibleJohn O Loughlin8-0/+148
To enable add the following with your ip address to your inventory file: [prometheus_hosts] 172.24.4.19 Change-Id: I85add815367bcbcf1240398db2c43c2130537969 Signed-off-by: John O Loughlin <john.oloughlin@intel.com>
2018-09-28WIP: Add role to auto install docker on hostsKamil Wiatrowski16-34/+316
Auto install docker with dependencies on hosts: apt install python apt install python-pip pip install docker-py apt install docker.io Set docker proxy using host proxy settings. Updated documentation. Change-Id: Ibec7e0a7e484d5a9a8656cd3598c3acc7c2e2184 Signed-off-by: Kamil Wiatrowski <kamilx.wiatrowski@intel.com>
2018-09-10Merge "Add support for 'collectd-master' container"Aaron Smith3-13/+86
2018-09-07Add support for 'collectd-master' containerRadoslaw Jablonski3-13/+86
'collectd-master' contains development versions of collectd with the latest features. It is based on master branch from collect repository. Change-Id: I720b5e5938b402281674ee73851c5f611e4d1178 Signed-off-by: Radoslaw Jablonski <radoslawx.jablonski@intel.com>
2018-09-07docker: Add Dockerfile of DMA localagentToshiaki Takahashi1-0/+25
Change-Id: I2e12ee574cc0b1fd5de178b576590ae78ff533c6 Signed-off-by: Toshiaki Takahashi <takahashi.tsc@ncos.nec.co.jp>
2018-08-31Fix for Grafana does not plot the RDT plugin data correctly.Kamil Wiatrowski2-2/+6
Fixed the interval of intel_rdt plugin and Grafana dashboard settings to follow the correct interval. Change-Id: Ia792c6b6308526d82f153275d5d5393b0aea312d Signed-off-by: Kamil Wiatrowski <kamilx.wiatrowski@intel.com>
2018-06-18Configure collectd to load ipmi before PMUJohn O'Loughlin1-1/+1
Collectd loads config files in alphabetical order. Ansible creates the config files for collectd. In this patch we change the name ipmi.conf to 0_ipmi.conf This will allow ipmi to be loaded before PMU. If PMU is loaded before ipmi the container will crash. This is a bug in collectd 5.8 Change-Id: I3334a3a1970f596e36f665698649d6c04fd38fbb Signed-off-by: John O Loughlin <john.oloughlin@intel.com>
2018-03-16ansible: add task to copy custom types.db file to targetsGordon Kelly3-0/+28
Change-Id: I0ae30a46d11d53cdc218e38d0b3a852aa5be147d Signed-off-by: Gordon Kelly <gordon.kelly@intel.com>
2018-03-16Merge "ansible: break task to copy additional config files to own file"Gordon Kelly2-9/+25
2018-03-16ansible: break task to copy additional config files to own fileGordon Kelly2-9/+25
Change-Id: Iffba385bd8e565459288f95eadf8a52bb6cc0084 Signed-off-by: Gordon Kelly <gordon.kelly@intel.com>
2018-03-16ansible:Put plugins in alphabetical order and fix swap plugin config pathGordon Kelly1-42/+41
Change-Id: Ie146e0ac9ad5e8bc1721b51e4e5112db51462854 Signed-off-by: Gordon Kelly <gordon.kelly@intel.com>
2018-03-13Clean up barometer-collectd DockerfileLeif Madsen1-11/+11
By merging several of the RUN lines and executing a yum cleanup all at the end of the dependency installation, the resulting container image will be around 300MB smaller. Change-Id: I63139a5283ea40ec8ea5cc3fd7aa7faddc90f3ce Signed-off-by: Leif Madsen <lmadsen@redhat.com>
2018-03-02ansible: add checks to ensure all ipmi dependancies are metGordon Kelly5-10/+93
Change-Id: I342016af10a1ed3a11364bda7bd7a563882fafbd Signed-off-by: Gordon Kelly <gordon.kelly@intel.com>
2018-03-02Merge "ansible: add functionality to copy custom config files to target node"Gordon Kelly2-0/+14
2018-03-02ansible: add functionality to copy custom config files to target nodeGordon Kelly2-0/+14
Change-Id: I6e7cb3e0923495e236b74444b1da3f4450122d02 Signed-off-by: Gordon Kelly <gordon.kelly@intel.com>
2018-02-28ansible: add roles to launch ves and kafka containersGordon Kelly4-0/+142
Change-Id: Ida03c47bbe94600b034c95bd0d795e62c253303c Signed-off-by: Gordon Kelly <gordon.kelly@intel.com>
2018-02-28Merge "docker: add Dockerfile for barometer-snmp"Gordon Kelly1-0/+4
2018-02-28ansible: add roles to launch collectd, influxdb and grafana containersGordon Kelly5-0/+191
Change-Id: I330172a2165e51a1557f084fd85fce12dfaad3a7 Signed-off-by: Gordon Kelly <gordon.kelly@intel.com>
2018-02-28Revert "Merge conflict"Aaron Smith35-0/+1922
This reverts commit 7f4ef61d68c3ed96759f3553b2793e0ce6a7e4a5. Change-Id: I0ac115a5e6dfbc53051ed7ee6ae0ceb72a8128af Signed-off-by: TsaLaGi <aasmith@redhat.com>
2018-02-27Merge conflictTsaLaGi35-1922/+0
Revert "Merge "ansible: add ansible scripts to configure .conf file on collectd nodes"" This reverts commit 7effd9e1e84dd7fa2a189a0815b5be1c0fcb165a, reversing changes made to b26034d05aa81f624e9bcee2c8e82a1cacfe44c4. Change-Id: I6f77b4432bbe0de29db3e099263e461e3043b22e Signed-off-by: TsaLaGi <aasmith@redhat.com>
2018-02-23Merge "ansible: add ansible scripts to configure .conf file on collectd nodes"Aaron Smith35-0/+1922
2018-02-23ansible: add ansible scripts to configure .conf file on collectd nodesGordon Kelly35-0/+1922
Change-Id: I7349582f7412088f4d303ca52eabf40afea3f5fe Signed-off-by: gordonkelly <gordon.kelly@intel.com>
2018-02-23docker: add Dockerfile for barometer-snmpGordon Kelly1-0/+4
Change-Id: I0e53dc5c9889c3f503ab4459aae8143243959c17 Signed-off-by: Gordon Kelly <gordon.kelly@intel.com>
2018-02-22Merge "docker: add command to run run_collectd script on bring up"Aaron Smith1-0/+2
2018-02-21compose: modify zookeeper tag and add container namesGordon Kelly2-1/+6
Change-Id: I676940bb0d5c7d9e181d27b15130e6ec4a4ececd Signed-off-by: Gordon Kelly <gordon.kelly@intel.com>
2018-02-21docker: add command to run run_collectd script on bring upGordon Kelly1-0/+2
Change-Id: I509ee90f29115171e65b77dbba3081ae69aa0c8c Signed-off-by: Gordon Kelly <gordon.kelly@intel.com>
2018-01-23docker: add docker-compose files for running barometer-imagesGordon Kelly2-0/+37
Change-Id: Ia02aa8d64ecb0306e0611d2dc76594bee86b0f43 Signed-off-by: gordonkelly <gordon.kelly@intel.com>
2018-01-23docker: update ves image to load yaml and config filesGordon Kelly2-10/+19
Update ves image to load yaml and config files from /opt/ves/ directory and rename host yaml file. Change-Id: I3caf51150d10db08b8ef1c20a53c320b27a6acb8 Signed-off-by: gordonkelly <gordon.kelly@intel.com>
2018-01-23Merge "docker: barometer-collectd openstack plugin deps"Maryam Tahhan1-0/+2
2018-01-23docker: updated grafana image to continue to send API request to grafanaGordon Kelly2-10/+22
Updated grafana image to continue to send API request to grafana server at 1 sec intervals at start time until grafana server is up and listening on port. Dashboards folder has been moved to /opt/grafana/dashboards. Documentation updated accordingly for all changes Change-Id: I748b05372f0aa0890d3befa5645834fb217db784 Signed-off-by: gordonkelly <gordon.kelly@intel.com>
2018-01-22docker: barometer-collectd openstack plugin depsMaryam Tahhan1-0/+2
Update the the barometer-collectd container to install the python dependencies for the openstack plugins. Change-Id: If8ba14066aff5f0257a400ece642a8d478600c77 Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
2018-01-15Merge "docker: ves update paths + rename dir"Aaron Smith2-1/+36
2018-01-12Merge "docker: influxdb add collectd database"Aaron Smith1-2/+11
2018-01-12docker: ves update paths + rename dirMaryam Tahhan2-1/+36
Update the paths in the Dockerfile to copy the bash startup script to the correct location. Rename the ves directory to barometer-ves. Change-Id: I13705a6c50d4487581e2ac7a4d0d2f6032db6415 Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
2018-01-12docker: influxdb add collectd databaseMaryam Tahhan1-2/+11
Change-Id: Ie417439b4fd6f0793925a20d95824c82af4eca7a Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
2018-01-12docker: rename barometer image and update documentationGordon Kelly3-1/+1
Rename the barometer image from barometer to barometer-collectd to align with naming convention of other barometer images and move relevant files to new barometer-collectd directory.Docker userguide also updated accordingly Change-Id: Id866baf41bc38d3db8575ee00abfc64e97c7259b Signed-off-by: gordonkelly <gordon.kelly@intel.com>
2018-01-11Merge "docker: add openstack plugins to barometer"Aaron Smith1-1/+6
2018-01-11Merge "docker: rename grafana directory"Aaron Smith14-0/+0
2018-01-11docker: add ves application container to barometer plus appropiate yaml fileGordon Kelly2-0/+42
Change-Id: Ia6fd4797e28cae64af40c4e3395a51588fd2aab3 Signed-off-by: gordonkelly <gordon.kelly@intel.com>
2018-01-11docker: rename grafana directoryMaryam Tahhan14-0/+0
Rename the grafana directory to barometer-grafana and remove references to docker compose from the documentation till we have a new barometer docker compose file. Change-Id: I4f64a6c10a146a39549380bb33837ae7c39cac2a Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
2018-01-11docker: add openstack plugins to barometerMaryam Tahhan1-1/+6
Add the openstack plugins to the barometer docker. This just clones the source to make sure it's available in the container. Configuration is up to the end user. Change-Id: Iaa62be8363f95b69c76d64bed49f1453597e123b Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
2018-01-11docker: cleanup directories and filesMaryam Tahhan9-68/+0
Rename docker container directories to contain the barometer_ prefix to prevent any naming clashes with other opnfv containers. Cleanup files that are no longer needed. The patch cleans up trailing whitespace. Change-Id: I332626554502a3e17685a2abd98c0679f30d0c24 Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
2018-01-10docker: remove zookeeper from kafka dockerGordon Kelly2-7/+16
Remove zookeeper from kafka docker and add ability to specify kafka broker id and address of zookeeper host. Change-Id: Ib6f46cf326999dcd1440dc06ab5cf6665ec578ad Signed-off-by: gordonkelly <gordon.kelly@intel.com>