Merge branch 'integration' of gitlab.it-innovation.soton.ac.uk:FLAME/flame-clmc into integration
Showing
- Vagrantfile 4 additions, 5 deletionsVagrantfile
- infra/streaming/rspec.yml 34 additions, 0 deletionsinfra/streaming/rspec.yml
- src/clmc-spec/src/main/resources/inputs/host_resource_input 9 additions, 0 deletionssrc/clmc-spec/src/main/resources/inputs/host_resource_input
- src/clmc-spec/src/main/resources/monSpecTestConfig.properties 8 additions, 0 deletions...clmc-spec/src/main/resources/monSpecTestConfig.properties
- src/clmc-spec/src/main/resources/queries/host_resource_query 4 additions, 0 deletionssrc/clmc-spec/src/main/resources/queries/host_resource_query
- test/services/apache/install-apache.sh 11 additions, 3 deletionstest/services/apache/install-apache.sh
- test/services/apache/telegraf_apache_template.conf 22 additions, 1 deletiontest/services/apache/telegraf_apache_template.conf
- test/services/ffmpeg/telegraf_ffmpeg_template.conf 1 addition, 1 deletiontest/services/ffmpeg/telegraf_ffmpeg_template.conf
- test/services/ffmpeg/transcode.sh 10 additions, 7 deletionstest/services/ffmpeg/transcode.sh
- test/services/ipendpoint/telegraf_ipendpoint_template.conf 1 addition, 1 deletiontest/services/ipendpoint/telegraf_ipendpoint_template.conf
- test/services/jmeter/install-jmeter.sh 43 additions, 0 deletionstest/services/jmeter/install-jmeter.sh
- test/services/mongo/telegraf_mongo_template.conf 1 addition, 1 deletiontest/services/mongo/telegraf_mongo_template.conf
- test/services/vlc/install-vlc.sh 29 additions, 0 deletionstest/services/vlc/install-vlc.sh
- test/services/vlc/telegraf_vlc_template.conf 112 additions, 0 deletionstest/services/vlc/telegraf_vlc_template.conf
- test/streaming/manual.md 57 additions, 4 deletionstest/streaming/manual.md
Loading
Please register or sign in to comment