merge xapi-rrd

Makefile

@@ -243,7 +243,8 @@ install: build doc sdk doc-json
 		gzip http-lib pciutil sexpr stunnel uuid xml-light2 zstd xapi-compression safe-resources \
 		message-switch message-switch-async message-switch-cli message-switch-core message-switch-lwt \
 		message-switch-unix xapi-idl forkexec xapi-forkexecd xapi-storage xapi-storage-script xapi-storage-cli \
-		xapi-nbd varstored-guard xapi-log xapi-open-uri xapi-tracing xapi-expiry-alerts cohttp-posix
+		xapi-nbd varstored-guard xapi-log xapi-open-uri xapi-tracing xapi-expiry-alerts cohttp-posix \
+		xapi-rrd
 # docs
 	mkdir -p $(DESTDIR)$(DOCDIR)
 	cp -r $(XAPIDOC)/jekyll $(DESTDIR)$(DOCDIR)
@@ -263,7 +264,8 @@ uninstall:
 		gzip http-lib pciutil sexpr stunnel uuid xml-light2 zstd xapi-compression safe-resources \
 		message-switch message-switch-async message-switch-cli message-switch-core message-switch-lwt \
 		message-switch-unix xapi-idl forkexec xapi-forkexecd xapi-storage xapi-storage-script xapi-log \
-		xapi-open-uri xapi-tracing xapi-expiry-alerts cohttp-posix
+		xapi-open-uri xapi-tracing xapi-expiry-alerts cohttp-posix \
+		xapi-rrd
 
 compile_flags.txt: Makefile
 	(ocamlc -config-var ocamlc_cflags;\

ocaml/libs/xapi-rrd/.gitarchive-info

@@ -0,0 +1,2 @@
+Changeset: $Format:%H$
+Commit date: $Format:%cD$

ocaml/libs/xapi-rrd/.gitattributes

@@ -0,0 +1 @@
+.gitarchive-info export-subst

ocaml/libs/xapi-rrd/.github/workflows/ocaml-ci.yml

@@ -0,0 +1,38 @@
+name: Build and test
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  ocaml-test:
+    name: Ocaml tests
+    runs-on: ubuntu-20.04
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Pull configuration from xs-opam
+        run: |
+          curl --fail --silent https://raw.githubusercontent.com/xapi-project/xs-opam/master/tools/xs-opam-ci.env | cut -f2 -d " " > .env
+
+      - name: Load environment file
+        id: dotenv
+        uses: falti/dotenv-action@v1.0.4
+
+      - name: Use ocaml
+        uses: ocaml/setup-ocaml@v2
+        with:
+          ocaml-compiler: ${{ steps.dotenv.outputs.ocaml_version_full }}
+          opam-repositories: |
+            xs-opam: ${{ steps.dotenv.outputs.repository }}
+
+      - name: Install dependencies
+        run: opam install . --deps-only --with-test -v
+
+      - name: Build
+        run: opam exec -- make build
+
+      - name: Run tests
+        run: opam exec -- make test

ocaml/libs/xapi-rrd/.gitignore

@@ -0,0 +1,3 @@
+_build
+.merlin
+*.install

ocaml/libs/xapi-rrd/.ocamlformat

@@ -0,0 +1,9 @@
+profile=ocamlformat
+indicate-multiline-delimiters=closing-on-separate-line
+if-then-else=fit-or-vertical
+dock-collection-brackets=true
+break-struct=natural
+break-separators=before
+break-infix=fit-or-vertical
+break-infix-before-func=false
+sequence-blank-line=preserve-one

ocaml/libs/xapi-rrd/ChangeLog

@@ -0,0 +1,115 @@
+## v1.12.0 (11-Dec-2023)
+* lib: fix typo in ds field minimal_heartbeat
+
+## v1.11.0 (16-Nov-2023)
+* lib: remove Failure "hd" exceptions
+
+## v1.10.0 (02-Aug-2023)
+* rrd_updates: use yojson instead of ad-hoc json serialization
+
+## v1.9.2 (13-Jun-2023)
+* CA-378301: Avoid memory leaks when writing XML
+
+## v1.9.1 (28-Oct-2022)
+* CA-371780: Remove quadratic cost in ds_update_name
+
+## v1.9.0 (02-Aug-2022)
+* ocamlformat: apply new formatting
+* unix: remove code from module
+* CA-367236: replace ezjsonm with yojson
+* Add license to opam metadata and delete deprecated package
+* ci: drop travis
+* ci: use github
+* maintenance: format code with ocamlformat
+* chore: prepare for ocamlformat, use dune 2.0
+
+## v1.8.2 (09-Sep-2020)
+* maintenance(lib_test): refactor crowbar tests
+* fix (lib_test): remove duplicated test suite
+
+## v1.8.1 (24-Mar-2020)
+* CP-33354 fix inconsistent number of columns
+* rrd: update documentation
+* rrd: delete unused functions
+* maintenance: whitespace
+* rrd_updates: Do not expose Failure "hd" when exporting rrds
+* rrd: share to_string methods among serializers
+* rrd: cleanup around ds_values processing
+
+## v1.8.0 (31-Oct-2019)
+CA-329813: fix including a datasource to an rrd
+CA-329813: add regression tests
+opam: refresh metadata
+
+## v1.7.0 (29-Oct-2019)
+* CA-325844: Test RRAs are validated when deserializing
+* CA-329043: Add sanity checks to rrds
+* CA-329043: Use type system to avoid storing out-of-range values
+* CA-329043: add case generated by crowbar
+* unit_tests: compare min and max values once per ds
+* dune: simplify test definition
+* CA-329043: Add crowbar tests
+* CA-329043: Do not produce default values that are out-of-bounds
+* CA-329043: Add regression test
+* tests: add json marshalling
+* travis: load vars from xs-opam repo
+
+## v1.6.0 (29-Jul-2019)
+* CA-322008: Report out-of-bounds PDP values as NaN
+* maintenance: whitespace and commented code deletion
+* maintenance: use infix operators for Int64 in rrd
+* CA-322008: Reorganize code for incoming values by type
+* CA-322008: do not treat DERIVE sources as COUNTER
+* tests: add regression test for CA-322008
+* ci: update and simplify travis configuration
+* tests: use random names for files
+* tests: check that all values in RRas are within bounds
+* tests: convert int and string asserts to alcotest
+* tests: Consolidate floating-point comparisons
+* tests: port to alcotest
+
+## v1.5.0 (17-May-2019)
+* CA-315952 add missing data in Json output
+* CA-315952 fix JSON output
+
+## v1.4.1 (08-Jan-2019)
+* Deprecated package rrd in favour of xapi-rrd.
+* Move from jbuilder to dune.
+
+## v1.4.0 (03-Sep-2018)
+* Simplify PPX processing
+* Use rpclib if it's available
+
+## v1.3.0 (15-Mar-2018):
+* Make safe-string safe
+
+## v1.2.0 (28-Feb-2018):
+* Added missing bigarray dependency in the jbuild file
+
+## v1.1.0 (06-Dec-2017):
+* Updated dependencies
+* Code cleanup
+* Port to jbuilder
+
+## v1.0.1 (16-Jun-2017):
+* Use new ppx deriver in place of old camlp4 one
+* Fix deprecation warnings
+
+## v1.0.0 (27-Apr-2016):
+* Declare this package stable
+
+## v0.12.0 (25-Jun-2015):
+* rrd_updates: interpret a -ve start as relative to now
+* add a concept of rrd_timescales
+
+## v0.10.1 (2-Apr-2015):
+* remove dependency on xapi libraries
+* remove Unix dependency
+
+## v0.9.1 (26-Sep-2014):
+* CA-102285: Use the stream API to read the XML RRD file
+* Fix 'make install' and 'make uninstall' (by making them PHONY targets)
+
+## v0.9.0 (6-Jun-2013):
+* first public release
+