aboutsummaryrefslogtreecommitdiffstats
path: root/docker
AgeCommit message (Collapse)AuthorFilesLines
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>
2018-01-10docker_grafana: add dashboards to docker and move dashboards from docker/ to ↵Gordon Kelly12-0/+1
docker/grafana Change-Id: I8bfb3c9aa11f89b987e7cf20dd3ce7904cb3f8b8 Signed-off-by: gordonkelly <gordon.kelly@intel.com>
2018-01-10docker: add barometer/grafana grafanaGordon Kelly3-0/+102
Change-Id: I6352b908ee1fc0819e19f786d73897fd6db841e6 Signed-off-by: gordonkelly <gordon.kelly@intel.com>
2018-01-08Merge "docker: add kafka container for barometer"Maryam Tahhan2-0/+38
2018-01-08docker: add kafka container for barometerGordon Kelly2-0/+38
Change-Id: I9e229ff08740e1d098b5e11cc61dde874ee55e02 Signed-off-by: gordonkelly <gordon.kelly@intel.com>
2017-12-20docker: adding influxdb container for barometerGordon Kelly2-0/+38
Change-Id: Iaaa5d5fad2b0d38bbc235a8382fd5badd58b3e65 Signed-off-by: gordonkelly <gordon.kelly@intel.com>
2017-12-05dockerfile: update for OPNFV docker buildMaryam Tahhan1-7/+7
The opnfv docker build runs in the docker directory not the barometer directory so it doesn't have access to the top level barometer directories that it needs to build the barometer image. This commit modifies the Dockerfile to clone the barometer repo inside the container image. Change-Id: I3518f4a64e806f69b424d24620fb13a9d45e4335 Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
2017-11-27Merge "Added snmpd container"Aaron Smith2-0/+28
2017-11-24docker: update grafana dashboardsMaryam Tahhan12-685/+14726
Add grafana dashboard json files to import to grafana. Change-Id: Ib78b82029d68199e1611f3c94e265741d730c676 Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
2017-11-20Added snmpd containerTaras Chornyi2-0/+28
Change-Id: Icec7fa09b0b97594383c5ec8c45c7eb4ea586a30 Signed-off-by: Taras Chornyi <tarasx.chornyi@intel.com>
2017-11-20docker: update docker configurationShobhi Jain1-2/+0
* update docker user guide Change-Id: Ia2d7ec26562e8b9feadd8a63459aac401bf18c44 Signed-off-by: Shobhi Jain <shobhi.jain@intel.com>
2017-11-20docker: add instructions to user guideMaryam Tahhan1-1/+2
* cleaned up whitespace issues Change-Id: Ia4ac74343f71dbe85fffb3d1c604c227958fb380 Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
2017-11-17docker: Added docker container for running collectdTaras Chornyi8-0/+887
Added InfluxDB and Grafana containers. Change-Id: Ifa46fac03c0175267d9cbffed5354193ad182733 Signed-off-by: Taras Chornyi <tarasx.chornyi@intel.com>