diff --git a/dune-project b/dune-project index 0d402cd7a9d..eba1984ca9a 100644 --- a/dune-project +++ b/dune-project @@ -22,10 +22,6 @@ (name xml-light2) ) -(package - (name xen-api-sdk) -) - (package (name xen-api-client-lwt) ) @@ -65,10 +61,37 @@ (package (name xapi-tracing) + (depends + ocaml + dune + (alcotest :with-test) + re + uri + (uuid :with-test) + (xapi-log :version) + (xapi-stdext-threads :version) + ) + (synopsis "Allows to instrument code to generate tracing information") + (description "This library provides modules to allow gathering runtime traces.") ) (package (name xapi-tracing-export) + (depends + ocaml + cohttp-posix + dune + cohttp + rpclib + (xapi-log :version) + (xapi-open-uri :version) + (xapi-stdext-threads :version) + (xapi-stdext-unix :version) + (xapi-tracing :version) + (zstd :version) + ) + (synopsis "Export traces in multiple protocols and formats") + (description "This library export traces is able to push traces to http endpoints or generate compressed tarballs in the filesystem.") ) (package @@ -93,18 +116,56 @@ (package (name rrdd-plugin) + (synopsis "A plugin library for the xapi performance monitoring daemon") + (description "This library allows one to expose a datasource which can then be sampled by the performance monitoring daemon.") + (depends + ocaml + astring + rpclib + (xapi-forkexecd :version) + (xapi-stdext-pervasives :version) + (xapi-stdext-std :version) + (xapi-stdext-threads :version) + (xapi-stdext-unix :version) + (xapi-idl :version) + xenstore_transport + ) ) (package (name xapi-rrdd) + (synopsis "Performance monitoring daemon for xapi") + (description "This daemon monitors 'datasources' i.e. time-varying values such as performance counters and records the samples in RRD archives. These archives can be used to examine historical performance trends.") + (depends + (ocaml (>= "4.02.0")) + dune-build-info + astring + (gzip :version) + (http-lib :version) + inotify + io-page + mtime + ppx_deriving_rpc + rpclib + systemd + (ezxenstore :version) + (uuid :version) + (xapi-backtrace :version) + (xapi-idl :version) + (xapi-rrd :version) + (xapi-stdext-threads :version) + ) ) (package (name xapi-rrd-transport-utils) -) - -(package - (name xapi-rrd-transport) + (synopsis "Shared-memory protocols for exposing performance counters") + (description "VMs running on a Xen host can use this library to expose performance counters which can be sampled by the xapi performance monitoring daemon.") + (authors "John Else") + (depends + ocaml + cmdliner + ) ) (package diff --git a/ocaml/libs/tracing/dune b/ocaml/libs/tracing/dune index 743b5418f69..e30fee8c140 100644 --- a/ocaml/libs/tracing/dune +++ b/ocaml/libs/tracing/dune @@ -28,4 +28,5 @@ (test (name test_tracing) (modules test_tracing) + (package xapi-tracing) (libraries tracing alcotest uuid)) diff --git a/rrdd-plugin.opam b/rrdd-plugin.opam index 093a8396b34..0c1c31907bb 100644 --- a/rrdd-plugin.opam +++ b/rrdd-plugin.opam @@ -1,34 +1,38 @@ # This file is generated by dune, edit dune-project instead -license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception" opam-version: "2.0" -maintainer: "xen-api@lists.xen.org" -authors: "xen-api@lists.xen.org" +synopsis: "A plugin library for the xapi performance monitoring daemon" +description: + "This library allows one to expose a datasource which can then be sampled by the performance monitoring daemon." +maintainer: ["Xapi project maintainers"] +authors: ["xen-api@lists.xen.org"] +license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception" homepage: "https://xapi-project.github.io/" bug-reports: "https://github.com/xapi-project/xen-api/issues" -dev-repo: "git+https://github.com/xapi-project/xen-api.git" -build: [ - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] depends: [ + "dune" {>= "2.0"} "ocaml" - "dune" {build & >= "1.0+beta10"} "astring" "rpclib" - "xapi-forkexecd" - "xapi-stdext-pervasives" - "xapi-stdext-std" - "xapi-stdext-threads" - "xapi-stdext-unix" - "xapi-idl" - "xapi-rrd-transport" {>= "0.9.0"} + "xapi-forkexecd" {version} + "xapi-stdext-pervasives" {version} + "xapi-stdext-std" {version} + "xapi-stdext-threads" {version} + "xapi-stdext-unix" {version} + "xapi-idl" {version} "xenstore_transport" ] -synopsis: "A plugin library for the xapi performance monitoring daemon" -description: """ -This library allows one to expose a datasource which can then be -sampled by the performance monitoring daemon.""" -url { - src: - "https://github.com/xapi-project/xen-api/archive/master.tar.gz" -} +build: [ + ["dune" "subst"] {pinned} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +dev-repo: "git+https://github.com/xapi-project/xen-api.git" diff --git a/rrdd-plugin.opam.template b/rrdd-plugin.opam.template deleted file mode 100644 index 2c889ba1aa0..00000000000 --- a/rrdd-plugin.opam.template +++ /dev/null @@ -1,32 +0,0 @@ -opam-version: "2.0" -maintainer: "xen-api@lists.xen.org" -authors: "xen-api@lists.xen.org" -homepage: "https://xapi-project.github.io/" -bug-reports: "https://github.com/xapi-project/xen-api/issues" -dev-repo: "git+https://github.com/xapi-project/xen-api.git" -build: [ - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -depends: [ - "ocaml" - "dune" {build & >= "1.0+beta10"} - "astring" - "rpclib" - "xapi-forkexecd" - "xapi-stdext-pervasives" - "xapi-stdext-std" - "xapi-stdext-threads" - "xapi-stdext-unix" - "xapi-idl" - "xapi-rrd-transport" {>= "0.9.0"} - "xenstore_transport" -] -synopsis: "A plugin library for the xapi performance monitoring daemon" -description: """ -This library allows one to expose a datasource which can then be -sampled by the performance monitoring daemon.""" -url { - src: - "https://github.com/xapi-project/xen-api/archive/master.tar.gz" -} diff --git a/xapi-rrd-transport-utils.opam b/xapi-rrd-transport-utils.opam index 08f47382454..1f4083d7195 100644 --- a/xapi-rrd-transport-utils.opam +++ b/xapi-rrd-transport-utils.opam @@ -1,22 +1,30 @@ # This file is generated by dune, edit dune-project instead -license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception" opam-version: "2.0" -maintainer: "xen-api@lists.xen.org" -authors: "John Else" -homepage: "https://github.com/xapi-project/xen-api" -dev-repo: "git+https://github.com/xapi-project/xen-api.git" -bug-reports: "https://github.com/xapi-project/xen-api" -build: [[ "dune" "build" "-p" name "-j" jobs ]] +synopsis: "Shared-memory protocols for exposing performance counters" +description: + "VMs running on a Xen host can use this library to expose performance counters which can be sampled by the xapi performance monitoring daemon." +maintainer: ["Xapi project maintainers"] +authors: ["John Else"] +license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception" +homepage: "https://xapi-project.github.io/" +bug-reports: "https://github.com/xapi-project/xen-api/issues" depends: [ + "dune" {>= "2.0"} "ocaml" - "dune" {build & >= "1.0+beta10"} "cmdliner" - "xapi-rrd-transport" {>= "2.0.0"} ] -synopsis: "Shared-memory protocols for exposing performance counters" -description: """ -VMs running on a Xen host can use this library to expose performance -counters which can be sampled by the xapi performance monitoring daemon.""" -url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" -} +build: [ + ["dune" "subst"] {pinned} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +dev-repo: "git+https://github.com/xapi-project/xen-api.git" diff --git a/xapi-rrd-transport-utils.opam.template b/xapi-rrd-transport-utils.opam.template deleted file mode 100644 index 236e9e439fb..00000000000 --- a/xapi-rrd-transport-utils.opam.template +++ /dev/null @@ -1,20 +0,0 @@ -opam-version: "2.0" -maintainer: "xen-api@lists.xen.org" -authors: "John Else" -homepage: "https://github.com/xapi-project/xen-api" -dev-repo: "git+https://github.com/xapi-project/xen-api.git" -bug-reports: "https://github.com/xapi-project/xen-api" -build: [[ "dune" "build" "-p" name "-j" jobs ]] -depends: [ - "ocaml" - "dune" {build & >= "1.0+beta10"} - "cmdliner" - "xapi-rrd-transport" {>= "2.0.0"} -] -synopsis: "Shared-memory protocols for exposing performance counters" -description: """ -VMs running on a Xen host can use this library to expose performance -counters which can be sampled by the xapi performance monitoring daemon.""" -url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" -} diff --git a/xapi-rrd-transport.opam b/xapi-rrd-transport.opam deleted file mode 100644 index e9882d24b12..00000000000 --- a/xapi-rrd-transport.opam +++ /dev/null @@ -1,33 +0,0 @@ -# This file is generated by dune, edit dune-project instead -license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception" -build: [ - ["dune" "subst"] {pinned} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - "@runtest" {with-test} - "@doc" {with-doc} - ] -] -opam-version: "2.0" -maintainer: "xen-api@lists.xen.org" -authors: "John Else" -homepage: "https://github.com/xapi-project/xen-api" -dev-repo: "git+https://github.com/xapi-project/xen-api.git" -bug-reports: "https://github.com/xapi-project/xen-api" -depends: [ - "ocaml" - "rrd-transport" {>= "2.0.0"} -] -synopsis: "Shared-memory protocols for exposing performance counters" -description: """ -VMs running on a Xen host can use this library to expose performance -counters which can be sampled by the xapi performance monitoring daemon.""" -url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" -} diff --git a/xapi-rrd-transport.opam.template b/xapi-rrd-transport.opam.template deleted file mode 100644 index 0fd8ff4efaa..00000000000 --- a/xapi-rrd-transport.opam.template +++ /dev/null @@ -1,17 +0,0 @@ -opam-version: "2.0" -maintainer: "xen-api@lists.xen.org" -authors: "John Else" -homepage: "https://github.com/xapi-project/xen-api" -dev-repo: "git+https://github.com/xapi-project/xen-api.git" -bug-reports: "https://github.com/xapi-project/xen-api" -depends: [ - "ocaml" - "rrd-transport" {>= "2.0.0"} -] -synopsis: "Shared-memory protocols for exposing performance counters" -description: """ -VMs running on a Xen host can use this library to expose performance -counters which can be sampled by the xapi performance monitoring daemon.""" -url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" -} diff --git a/xapi-rrdd.opam b/xapi-rrdd.opam index cb9849da949..4a798154dfa 100644 --- a/xapi-rrdd.opam +++ b/xapi-rrdd.opam @@ -1,42 +1,45 @@ # This file is generated by dune, edit dune-project instead -license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception" opam-version: "2.0" synopsis: "Performance monitoring daemon for xapi" -description: """ -This daemon monitors "datasources" i.e. time-varying values such as -performance counters and records the samples in RRD archives. These -archives can be used to examine historical performance trends.""" -maintainer: "xen-api@lists.xen.org" -authors: "xen-api@lists.xen.org" -homepage: "https://github.com/xapi-project/xen-api" +description: + "This daemon monitors 'datasources' i.e. time-varying values such as performance counters and records the samples in RRD archives. These archives can be used to examine historical performance trends." +maintainer: ["Xapi project maintainers"] +authors: ["xen-api@lists.xen.org"] +license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception" +homepage: "https://xapi-project.github.io/" bug-reports: "https://github.com/xapi-project/xen-api/issues" depends: [ + "dune" {>= "2.0"} "ocaml" {>= "4.02.0"} - "dune" "dune-build-info" "astring" - "gzip" - "http-lib" + "gzip" {version} + "http-lib" {version} "inotify" "io-page" "mtime" "ppx_deriving_rpc" "rpclib" "systemd" - "ezxenstore" - "uuid" - "xapi-backtrace" - "xapi-idl" - "xapi-rrd" - "xapi-rrd-transport" - "xapi-stdext-threads" - "xapi-stdext-unix" + "ezxenstore" {version} + "uuid" {version} + "xapi-backtrace" {version} + "xapi-idl" {version} + "xapi-rrd" {version} + "xapi-stdext-threads" {version} ] build: [ - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} + ["dune" "subst"] {pinned} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] ] dev-repo: "git+https://github.com/xapi-project/xen-api.git" -url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" -} diff --git a/xapi-rrdd.opam.template b/xapi-rrdd.opam.template deleted file mode 100644 index 3fed06195be..00000000000 --- a/xapi-rrdd.opam.template +++ /dev/null @@ -1,40 +0,0 @@ -opam-version: "2.0" -synopsis: "Performance monitoring daemon for xapi" -description: """ -This daemon monitors "datasources" i.e. time-varying values such as -performance counters and records the samples in RRD archives. These -archives can be used to examine historical performance trends.""" -maintainer: "xen-api@lists.xen.org" -authors: "xen-api@lists.xen.org" -homepage: "https://github.com/xapi-project/xen-api" -bug-reports: "https://github.com/xapi-project/xen-api/issues" -depends: [ - "ocaml" {>= "4.02.0"} - "dune" - "dune-build-info" - "astring" - "gzip" - "http-lib" - "inotify" - "io-page" - "mtime" - "ppx_deriving_rpc" - "rpclib" - "systemd" - "ezxenstore" - "uuid" - "xapi-backtrace" - "xapi-idl" - "xapi-rrd" - "xapi-rrd-transport" - "xapi-stdext-threads" - "xapi-stdext-unix" -] -build: [ - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -dev-repo: "git+https://github.com/xapi-project/xen-api.git" -url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" -} diff --git a/xapi-tracing-export.opam b/xapi-tracing-export.opam index c58065eb2a3..811f174eee9 100644 --- a/xapi-tracing-export.opam +++ b/xapi-tracing-export.opam @@ -1,32 +1,39 @@ # This file is generated by dune, edit dune-project instead -license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception" opam-version: "2.0" -maintainer: "xen-api@lists.xen.org" -authors: "xen-api@lists.xen.org" +synopsis: "Export traces in multiple protocols and formats" +description: + "This library export traces is able to push traces to http endpoints or generate compressed tarballs in the filesystem." +maintainer: ["Xapi project maintainers"] +authors: ["xen-api@lists.xen.org"] +license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception" homepage: "https://xapi-project.github.io/" -bug-reports: "https://github.com/xapi-project/xen-api.git" -dev-repo: "git+https://github.com/xapi-project/xen-api.git" -build: [[ "dune" "build" "-p" name "-j" jobs ]] - -available: [ os = "linux" ] +bug-reports: "https://github.com/xapi-project/xen-api/issues" depends: [ "ocaml" "cohttp-posix" "dune" "cohttp" "rpclib" - "xapi-log" - "xapi-open-uri" - "xapi-stdext-threads" - "xapi-stdext-unix" - "xapi-tracing" - "zstd" + "xapi-log" {version} + "xapi-open-uri" {version} + "xapi-stdext-threads" {version} + "xapi-stdext-unix" {version} + "xapi-tracing" {version} + "zstd" {version} ] -synopsis: "Library required by xapi" -description: """ -These libraries are provided for backwards compatibility only. -No new code should use these libraries.""" -url { - src: - "https://github.com/xapi-project/xen-api/archive/master.tar.gz" -} +build: [ + ["dune" "subst"] {pinned} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +dev-repo: "git+https://github.com/xapi-project/xen-api.git" +available: [ os = "linux" ] diff --git a/xapi-tracing-export.opam.template b/xapi-tracing-export.opam.template index ebfcab319a7..9299164924d 100644 --- a/xapi-tracing-export.opam.template +++ b/xapi-tracing-export.opam.template @@ -1,30 +1 @@ -opam-version: "2.0" -maintainer: "xen-api@lists.xen.org" -authors: "xen-api@lists.xen.org" -homepage: "https://xapi-project.github.io/" -bug-reports: "https://github.com/xapi-project/xen-api.git" -dev-repo: "git+https://github.com/xapi-project/xen-api.git" -build: [[ "dune" "build" "-p" name "-j" jobs ]] - available: [ os = "linux" ] -depends: [ - "ocaml" - "cohttp-posix" - "dune" - "cohttp" - "rpclib" - "xapi-log" - "xapi-open-uri" - "xapi-stdext-threads" - "xapi-stdext-unix" - "xapi-tracing" - "zstd" -] -synopsis: "Library required by xapi" -description: """ -These libraries are provided for backwards compatibility only. -No new code should use these libraries.""" -url { - src: - "https://github.com/xapi-project/xen-api/archive/master.tar.gz" -} diff --git a/xapi-tracing.opam b/xapi-tracing.opam index 0d763717741..389b4ed3089 100644 --- a/xapi-tracing.opam +++ b/xapi-tracing.opam @@ -1,27 +1,36 @@ # This file is generated by dune, edit dune-project instead -license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception" opam-version: "2.0" -maintainer: "xen-api@lists.xen.org" -authors: "xen-api@lists.xen.org" +synopsis: "Allows to instrument code to generate tracing information" +description: + "This library provides modules to allow gathering runtime traces." +maintainer: ["Xapi project maintainers"] +authors: ["xen-api@lists.xen.org"] +license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception" homepage: "https://xapi-project.github.io/" -bug-reports: "https://github.com/xapi-project/xen-api.git" -dev-repo: "git+https://github.com/xapi-project/xen-api.git" -build: [[ "dune" "build" "-p" name "-j" jobs ]] - -available: [ os = "linux" ] +bug-reports: "https://github.com/xapi-project/xen-api/issues" depends: [ "ocaml" "dune" + "alcotest" {with-test} "re" "uri" - "xapi-log" - "xapi-stdext-threads" + "uuid" {with-test} + "xapi-log" {version} + "xapi-stdext-threads" {version} ] -synopsis: "Library required by xapi" -description: """ -These libraries are provided for backwards compatibility only. -No new code should use these libraries.""" -url { - src: - "https://github.com/xapi-project/xen-api/archive/master.tar.gz" -} +build: [ + ["dune" "subst"] {pinned} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +dev-repo: "git+https://github.com/xapi-project/xen-api.git" +available: [ os = "linux" ] diff --git a/xapi-tracing.opam.template b/xapi-tracing.opam.template index c37fb0a2256..9299164924d 100644 --- a/xapi-tracing.opam.template +++ b/xapi-tracing.opam.template @@ -1,25 +1 @@ -opam-version: "2.0" -maintainer: "xen-api@lists.xen.org" -authors: "xen-api@lists.xen.org" -homepage: "https://xapi-project.github.io/" -bug-reports: "https://github.com/xapi-project/xen-api.git" -dev-repo: "git+https://github.com/xapi-project/xen-api.git" -build: [[ "dune" "build" "-p" name "-j" jobs ]] - available: [ os = "linux" ] -depends: [ - "ocaml" - "dune" - "re" - "uri" - "xapi-log" - "xapi-stdext-threads" -] -synopsis: "Library required by xapi" -description: """ -These libraries are provided for backwards compatibility only. -No new code should use these libraries.""" -url { - src: - "https://github.com/xapi-project/xen-api/archive/master.tar.gz" -} diff --git a/xen-api-sdk.opam b/xen-api-sdk.opam deleted file mode 100644 index 588eb1a5a56..00000000000 --- a/xen-api-sdk.opam +++ /dev/null @@ -1,22 +0,0 @@ -# This file is generated by dune, edit dune-project instead - -opam-version: "2.0" -name: "xen-api-sdk" -synopsis: "Xen API SDK generation code" -maintainer: "xen-api@lists.xen.org" -authors: [ "xen-api@lists.xen.org" ] -license: "BSD-2-Clause" -homepage: "https://github.com/xapi-project/xen-api" -bug-reports: "https://github.com/xapi-project/xen-api/issues" -dev-repo: "git+https://github.com/xapi-project/xen-api.git" -url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" -} -tags: [ "org:xapi-project" ] -build: [[ "dune" "build" "-p" name "-j" jobs]] -depends: [ - "dune" - "xapi-datamodel" - "mustache" - "astring" -] diff --git a/xen-api-sdk.opam.template b/xen-api-sdk.opam.template deleted file mode 100644 index ee1ca829e18..00000000000 --- a/xen-api-sdk.opam.template +++ /dev/null @@ -1,20 +0,0 @@ -opam-version: "2.0" -name: "xen-api-sdk" -synopsis: "Xen API SDK generation code" -maintainer: "xen-api@lists.xen.org" -authors: [ "xen-api@lists.xen.org" ] -license: "BSD-2-Clause" -homepage: "https://github.com/xapi-project/xen-api" -bug-reports: "https://github.com/xapi-project/xen-api/issues" -dev-repo: "git+https://github.com/xapi-project/xen-api.git" -url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" -} -tags: [ "org:xapi-project" ] -build: [[ "dune" "build" "-p" name "-j" jobs]] -depends: [ - "dune" - "xapi-datamodel" - "mustache" - "astring" -]