Merge branch 'simulationrefactor' into 'integration' (447300ac) · 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

447300ac

Commit 447300ac authored 7 years ago by Michael Boniface

Downloads
- Plain Diff

Merge branch 'simulationrefactor' into 'integration'

Simulationrefactor

See merge request mjb/flame-clmc!4

parents 5f940c1a 06627965

No related branches found

No related tags found

Loading

Changes 12

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Vagrantfile 34 additions, 14 deletions

Vagrantfile
scripts/influx/install-clmc-agent.sh 9 additions, 8 deletions

scripts/influx/install-clmc-agent.sh
scripts/influx/install-clmc-service.sh 4 additions, 4 deletions

scripts/influx/install-clmc-service.sh
scripts/influx/install-tick-stack-docker-compose.sh 0 additions, 51 deletions

scripts/influx/install-tick-stack-docker-compose.sh
scripts/influx/start-clmc-service.sh 1 addition, 5 deletions

scripts/influx/start-clmc-service.sh
scripts/influx/telegraf_ipendpoint1.conf 9 additions, 6 deletions

scripts/influx/telegraf_ipendpoint1.conf
scripts/influx/telegraf_ipendpoint2.conf 116 additions, 0 deletions

scripts/influx/telegraf_ipendpoint2.conf
src/mediaServiceSim/LineProtocolGenerator.py 205 additions, 63 deletions

src/mediaServiceSim/LineProtocolGenerator.py
src/mediaServiceSim/__pycache__/LineProtocolGenerator.cpython-36.pyc 0 additions, 0 deletions

...rviceSim/__pycache__/LineProtocolGenerator.cpython-36.pyc
src/mediaServiceSim/serviceSim.py 220 additions, 160 deletions

src/mediaServiceSim/serviceSim.py
src/mediaServiceSim/simulator_v2.py 91 additions, 0 deletions

src/mediaServiceSim/simulator_v2.py
ubuntu-xenial-16.04-cloudimg-console.log 508 additions, 518 deletions

ubuntu-xenial-16.04-cloudimg-console.log

with 1197 additions and 829 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