diff --git a/cardamon.bk.toml b/cardamon.bk.toml deleted file mode 100644 index d41489f..0000000 --- a/cardamon.bk.toml +++ /dev/null @@ -1,68 +0,0 @@ -# CPU -# ######################################## -[cpu] -name = "AMD Ryzen 7 PRO 6850U with Radeon Graphics" -curve = [ - 7.627190097500079, - 0.07551567953624883, - 20.45110313049153, - -1.5261422759740344, -] - -# Processes -# ######################################## -[[process]] -name = "rand-api" -up = "./rand-api" -down = "kill {pid}" -redirect.to = "file" -process.type = "baremetal" - -[[process]] -name = "rand-api-docker" -up = "docker run -d --name c1 -p 4244:4243 rand-api" -down = "bash -c 'docker stop c1 && docker rm c1'" -redirect.to = "file" -process.type = "docker" -process.containers = ["c1"] - -# Scenarios -# ######################################## -[[scenario]] -name = "stress" -desc = "" -command = "sh scenario.sh" -iterations = 2 -processes = ["rand-api", "rand-api-docker"] - -[[scenario]] -name = "stress_metal" -desc = "" -command = "sh scenario.sh" -iterations = 2 -processes = ["rand-api"] - -[[scenario]] -name = "stress_docker" -desc = "" -command = "sh scenario.sh" -iterations = 2 -processes = ["rand-api-docker"] - -# Observations -# ######################################## -[[observation]] -name = "stress" -scenarios = ["stress"] - -[[observation]] -name = "stress_metal" -scenarios = ["stress_metal"] - -[[observation]] -name = "stress_docker" -scenarios = ["stress_docker"] - -[[observation]] -name = "live_monitor" -processes = ["test_proc1", "test_proc2"] diff --git a/cardamon.toml b/cardamon.toml index feeb25c..d026c64 100644 --- a/cardamon.toml +++ b/cardamon.toml @@ -23,7 +23,7 @@ curve = [7.627190097500079,0.07551567953624883,20.45110313049153,-1.526142275974 # desc - command to stop the process. In the case of bare-metal processes # cardamon will pass the PID of the process to this command. You can # use `{pid}` as a placeholder in the command e.g. `kill {pid}`. -# default: empty string +# default - empty string # required - false # # proccess.type: @@ -45,14 +45,14 @@ curve = [7.627190097500079,0.07551567953624883,20.45110313049153,-1.526142275974 # output, "parent" attaches the processes output to cardamon, "file" # writes stdout and stderr to a file of the same name as this # process e.g. db.stdout. -# default: "file" +# default - "file" # required - false # # startup_grace: -# type - integer -# desc - the number of milliseconds Cardamon will wait before running -# scenarios -# default - 2000 ms +# type - string +# desc - the duration Cardamon will wait before running scenarios. Remember +# to include the duration unit. e.g ms, s etc +# default - "2000ms" # required - false # # EXAMPLE @@ -64,7 +64,7 @@ curve = [7.627190097500079,0.07551567953624883,20.45110313049153,-1.526142275974 # redirect.to = "file" # process.type = "docker" # process.containers = ["postgres"] -# startup_grace = 4000 +# startup_grace = "4000ms" [[process]] name = "test_proc" diff --git a/examples/hybrid/cardamon.toml b/examples/hybrid/cardamon.toml index 443cfae..dfb0ff6 100644 --- a/examples/hybrid/cardamon.toml +++ b/examples/hybrid/cardamon.toml @@ -25,7 +25,7 @@ down = "bash -c 'docker stop c1 && docker rm c1'" redirect.to = "file" process.type = "docker" process.containers = ["c1"] -startup_grace = 8000 +startup_grace = "8000ms" # Scenarios # ######################################## diff --git a/src/templates/cardamon.unix.toml b/src/templates/cardamon.unix.toml index ba0668d..c13f10f 100644 --- a/src/templates/cardamon.unix.toml +++ b/src/templates/cardamon.unix.toml @@ -43,12 +43,12 @@ # process e.g. db.stdout. # default: "file" # required - false -# +# # startup_grace: -# type - integer -# desc - the number of milliseconds Cardamon will wait before running -# scenarios -# default - 2000 ms +# type - string +# desc - the duration Cardamon will wait before running scenarios. Remember +# to include the duration unit. e.g ms, s etc +# default - "2000ms" # required - false # # EXAMPLE @@ -60,6 +60,7 @@ # redirect.to = "file" # process.type = "docker" # process.containers = ["postgres"] +# startup_grace = "4000ms" [[process]] name = "test_proc" diff --git a/src/templates/cardamon.win.toml b/src/templates/cardamon.win.toml index 2131691..5722ba5 100644 --- a/src/templates/cardamon.win.toml +++ b/src/templates/cardamon.win.toml @@ -19,7 +19,7 @@ # desc - command to stop the process. In the case of bare-metal processes # cardamon will pass the PID of the process to this command. You can # use `{pid}` as a placeholder in the command e.g. `kill {pid}`. -# default: empty string +# default - empty string # required - false # # proccess.type: @@ -41,14 +41,14 @@ # output, "parent" attaches the processes output to cardamon, "file" # writes stdout and stderr to a file of the same name as this # process e.g. db.stdout. -# default: "file" +# default - "file" # required - false # # startup_grace: -# type - integer -# desc - the number of milliseconds Cardamon will wait before running -# scenarios -# default - 2000 ms +# type - string +# desc - the duration Cardamon will wait before running scenarios. Remember +# to include the duration unit. e.g. ms, s etc +# default - "2000ms" # required - false # # EXAMPLE @@ -60,6 +60,7 @@ # redirect.to = "file" # process.type = "docker" # process.containers = ["postgres"] +# startup_grace = "4000ms" [[process]] name = "test_proc"