diff --git a/cluster/Dockerfile b/cluster/Dockerfile index e222f084..9089e92f 100644 --- a/cluster/Dockerfile +++ b/cluster/Dockerfile @@ -1,7 +1,7 @@ FROM ocaml/opam:debian-ocaml-4.13 AS build RUN sudo apt-get update && sudo apt-get install libc6-dev libev-dev capnproto m4 pkg-config libsqlite3-dev libgmp-dev libffi-dev -y --no-install-recommends RUN opam remote add origin 'https://opam.ocaml.org' --all-switches && opam remote remove default && opam update -RUN opam install dune>=2.8 ppx_expect>=v0.14.1 prometheus ppx_sexp_conv dune-build-info lwt>=5.4.1 capnp-rpc-lwt>=1.2 capnp-rpc-net capnp-rpc-unix>=1.2 extunix>=0.3.2 logs conf-libev digestif>=0.8 fpath lwt-dllist prometheus-app>=1.1 cohttp-lwt-unix sqlite3 psq mirage-crypto>=0.8.5 ppx_deriving ppx_deriving_yojson astring fmt>=0.8.9 cmdliner tar-unix>=2.0.0 yojson sexplib sha +RUN opam install dune>=2.8 ppx_expect>=v0.14.1 prometheus ppx_sexp_conv dune-build-info lwt>=5.4.1 capnp-rpc-lwt>=1.2 capnp-rpc-net capnp-rpc-unix>=1.2 extunix>=0.3.2 logs conf-libev digestif>=0.8 fpath lwt-dllist prometheus-app=1.1 cohttp-lwt-unix sqlite3 psq mirage-crypto>=0.8.5 ppx_deriving ppx_deriving_yojson astring fmt>=0.8.9 cmdliner tar-unix>=2.0.0 yojson sexplib sha RUN mkdir src && cd src && git clone 'https://github.com/ocurrent/ocluster' && opam pin -yn ocluster RUN cd src && git clone 'https://github.com/ocurrent/obuilder' && opam pin -yn obuilder WORKDIR src/ocluster diff --git a/current-bench.opam b/current-bench.opam index 7a4013b9..31554c7b 100644 --- a/current-bench.opam +++ b/current-bench.opam @@ -34,6 +34,7 @@ depends: [ "fpath" "logs" "postgresql" + "prometheus-app" {= "1.1"} "rresult" "omigrate" "timere" diff --git a/local-test-repo/Makefile b/local-test-repo/Makefile index a9803b1c..d8c85bc0 100644 --- a/local-test-repo/Makefile +++ b/local-test-repo/Makefile @@ -8,19 +8,19 @@ define BENCH_DATA_B1_T1_A "metrics": [ { "name": "grammarFunctor/parsing", - "value": 0.19, + "value": 0.3, "units": "secs", "trend": "lower-is-better" }, { "name": "grammarFunctor/typing", - "value": 0.28, + "value": 0.3, "units": "secs", "trend": "lower-is-better" }, { "name": "grammarFunctor/generate", - "value": 0.14, + "value": 0.1, "units": "secs", "trend": "lower-is-better" } @@ -40,14 +40,14 @@ define BENCH_DATA_B1_T1_B "metrics": [ { "name": "ops_per_sec", - "value": 690.0, + "value": 650.0, "units": "num/sec", "description": "The number of awesome things done in a second", "trend": "higher-is-better" }, { "name": "mbs_per_sec", - "value": 199, + "value": 189, "units": "mbps", "description": "Quantity of awesome data downloaded" } @@ -90,7 +90,3 @@ bench: @echo "$$BENCH_DATA_B1_T1_B" | jq -M . echo "Log message 4" echo "Log message 5" - @echo "$$BENCH_DATA_B1_T2" | jq -M . - echo "Log message 6" - echo "Log message 7" - @echo "$$BENCH_DATA_3" diff --git a/worker/cb-worker.opam b/worker/cb-worker.opam index 733099de..904fd288 100644 --- a/worker/cb-worker.opam +++ b/worker/cb-worker.opam @@ -16,7 +16,7 @@ depends: [ "ocluster-api" {= "dev"} "obuilder" {= "dev"} "obuilder-spec" {= "dev"} - "prometheus-app" + "prometheus-app" {= "1.1"} "fpath" "logs" "ocaml" {>= "4.08"}