Merge branch 'fms-mon' into 'integration' (28f13960) · Commits · flame / flame-clmc · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

F

flame-clmc
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents

Snippets Groups Projects

28f13960

Commit 28f13960 authored 7 years ago by Michael Boniface

Downloads
- Plain Diff

Merge branch 'fms-mon' into 'integration'

Fms mon

See merge request FLAME/flame-clmc!9

parents 2c16338c bf54f3d9

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

Vagrantfile 7 additions, 7 deletions

Vagrantfile
infra/full/rspec.yml 101 additions, 0 deletions

infra/full/rspec.yml
infra/streaming/rspec.yml 0 additions, 52 deletions

infra/streaming/rspec.yml
scripts/clmc-agent/install-clmc-agent.sh 1 addition, 1 deletion

scripts/clmc-agent/install-clmc-agent.sh
test/services/apache/install-apache.sh 9 additions, 1 deletion

test/services/apache/install-apache.sh
test/services/apache/telegraf_apache_template.conf 1 addition, 1 deletion

test/services/apache/telegraf_apache_template.conf
test/services/ffmpeg/install-ffmpeg.sh 15 additions, 0 deletions

test/services/ffmpeg/install-ffmpeg.sh
test/services/ffmpeg/telegraf_ffmpeg_template.conf 112 additions, 0 deletions

test/services/ffmpeg/telegraf_ffmpeg_template.conf
test/services/ffmpeg/transcode.sh 31 additions, 0 deletions

test/services/ffmpeg/transcode.sh
test/services/mongo/install-mongo.sh 1 addition, 0 deletions

test/services/mongo/install-mongo.sh
test/services/nginx/install-nginx.sh 17 additions, 2 deletions

test/services/nginx/install-nginx.sh
test/services/nginx/nginx.conf 14 additions, 0 deletions

test/services/nginx/nginx.conf
test/services/nginx/telegraf_nginx_template.conf 3 additions, 18 deletions

test/services/nginx/telegraf_nginx_template.conf
test/streaming/manual.md 36 additions, 0 deletions

test/streaming/manual.md

with 348 additions and 82 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment