adding latest grafonnet library support

.github/workflows/ci.yml

@@ -28,7 +28,7 @@ jobs:
       run: make deps
 
     - name: Run jsonnetfmt
-      run: for t in templates/**/*.jsonnet; do echo "Testing template ${t}"; ./bin/jsonnetfmt --test $t; echo 'Results:' ${?}; done
+      run: make format
 
   build:
     runs-on: ubuntu-latest

.gitignore

@@ -1,4 +1,5 @@
 templates/grafonnet-lib
+templates/vendor
 rendered
 tmp
 bin

Dockerfile

@@ -1,23 +1,21 @@
-FROM ubuntu
+FROM registry.access.redhat.com/ubi8/ubi-minimal
 
+# Set the working directory
 WORKDIR /performance-dashboards
-ARG DEBIAN_FRONTEND=noninteractive
 
 # Install necessary libraries for subsequent commands
-RUN apt-get update && apt-get install -y podman dumb-init python3.6 python3-distutils python3-pip python3-apt
+RUN microdnf install -y podman python3 python3-pip && \
+    microdnf clean all && \
+    rm -rf /var/cache/yum
 
 COPY . .
+
+# Set permissions
 RUN chmod -R 775 /performance-dashboards
 
 # Install dependencies
-RUN python3 -m pip install --upgrade pip
-RUN pip install -r requirements.txt
-
-# Cleanup the installation remainings
-RUN apt-get clean autoclean && \
-    apt-get autoremove --yes && \
-    rm -rf /var/lib/{apt,dpkg,cache,log}/
+RUN pip3 install --upgrade pip && \
+    pip3 install -r requirements.txt
 
 # Start the command
-ENTRYPOINT ["/usr/bin/dumb-init", "--"]
 CMD ["python3", "dittybopper/syncer/entrypoint.py"]

Makefile

@@ -1,45 +1,64 @@
-JSONNET = https://github.com/google/jsonnet/releases/download/v0.17.0/jsonnet-bin-v0.17.0-linux.tar.gz
+JB = https://github.com/jsonnet-bundler/jsonnet-bundler/releases/latest/download/jb-linux-amd64
 BINDIR = bin
 TEMPLATESDIR = templates
 OUTPUTDIR = rendered
 ALLDIRS = $(BINDIR) $(OUTPUTDIR)
 SYNCER_IMG_TAG ?= quay.io/cloud-bulldozer/dittybopper-syncer:latest
 PLATFORM = linux/amd64,linux/arm64,linux/ppc64le,linux/s390x
 
-# Get all templates at $(TEMPLATESDIR)
-TEMPLATES := $(wildcard $(TEMPLATESDIR)/**/*.jsonnet)
+ifeq ($(filter v2,$(MAKECMDGOALS)),v2)
+    # Set variables and instructions for v2
+    TEMPLATES := $(wildcard $(TEMPLATESDIR)/**/*-v2.jsonnet)
+	LIBRARY_PATH := $(TEMPLATESDIR)/vendor
+	JSONNET := https://github.com/cloud-bulldozer/utils/releases/download/v0.0.0/jsonnet-bin-v0.20.0-linux.tar.gz
+else
+	# Get all templates at $(TEMPLATESDIR)
+	TEMPLATES := $(filter-out %-v2.jsonnet, $(wildcard $(TEMPLATESDIR)/**/*.jsonnet))
+	LIBRARY_PATH := $(TEMPLATESDIR)/grafonnet-lib
+	JSONNET := https://github.com/google/jsonnet/releases/download/v0.17.0/jsonnet-bin-v0.17.0-linux.tar.gz
+endif
 
 # Replace $(TEMPLATESDIR)/*.jsonnet by $(OUTPUTDIR)/*.json
 outputs := $(patsubst $(TEMPLATESDIR)/%.jsonnet, $(OUTPUTDIR)/%.json, $(TEMPLATES))
 
 all: deps format build
 
-deps: $(ALLDIRS) $(TEMPLATESDIR)/grafonnet-lib $(BINDIR)/jsonnet
+deps: $(ALLDIRS) $(BINDIR)/jsonnet $(LIBRARY_PATH)
 
 $(ALLDIRS):
 	mkdir -p $(ALLDIRS)
 
 format: deps
 	$(BINDIR)/jsonnetfmt -i $(TEMPLATES)
 
-build: deps $(TEMPLATESDIR)/grafonnet-lib $(outputs)
+build: deps $(LIBRARY_PATH) $(outputs)
 
 clean:
 	@echo "Cleaning up"
-	rm -rf $(ALLDIRS) $(TEMPLATESDIR)/grafonnet-lib
-
-$(TEMPLATESDIR)/grafonnet-lib:
-	git clone --depth 1 https://github.com/grafana/grafonnet-lib.git $(TEMPLATESDIR)/grafonnet-lib
+	rm -rf $(ALLDIRS) $(TEMPLATESDIR)/vendor $(TEMPLATESDIR)/grafonnet-lib
 
 $(BINDIR)/jsonnet:
 	@echo "Downloading jsonnet binary"
 	curl -s -L $(JSONNET) | tar xz -C $(BINDIR)
+	@echo "Downloading jb binary"
+	curl -s -L $(JB) -o $(BINDIR)/jb
+	chmod +x $(BINDIR)/jb
+
+$(TEMPLATESDIR)/grafonnet-lib:
+	git clone --depth 1 https://github.com/grafana/grafonnet-lib.git $(TEMPLATESDIR)/grafonnet-lib
+
+$(TEMPLATESDIR)/vendor:
+	@echo "Downloading vendor files"
+	cd $(TEMPLATESDIR) && ../$(BINDIR)/jb install && cd ../
 
 # Build each template and output to $(OUTPUTDIR)
 $(OUTPUTDIR)/%.json: $(TEMPLATESDIR)/%.jsonnet
 	@echo "Building template $<"
 	mkdir -p $(dir $@)
-	$(BINDIR)/jsonnet $< > $@
+	$(BINDIR)/jsonnet -J ./$(LIBRARY_PATH) $< > $@
+
+v2: all
+	@echo "Rendered the v2 dashboards with latest grafonnet library"
 
 build-syncer-image: build
 	podman build --platform=${PLATFORM} -f Dockerfile --manifest=${SYNCER_IMG_TAG} .

README.md

@@ -34,6 +34,28 @@ bin/jsonnet templates/ocp-performance.jsonnet > rendered/ocp-performance.json
 $ ls rendered
 ocp-ingress-controller.json ocp-performance.json
 ```
+Similarly for V2, the dashboards that are built using latest grafonnet library, use 
+```
+$ make v2
+mkdir -p bin rendered
+Downloading jsonnet binary
+curl -s -L https://github.com/cloud-bulldozer/utils/releases/download/v0.0.0/jsonnet-bin-v0.20.0-linux.tar.gz | tar xz -C bin
+Downloading jb binary
+curl -s -L https://github.com/jsonnet-bundler/jsonnet-bundler/releases/latest/download/jb-linux-amd64 -o bin/jb
+chmod +x bin/jb
+Downloading vendor files
+cd templates && ../bin/jb install && cd ../
+GET https://github.com/grafana/grafonnet/archive/f40876da40d787e9c288de0b547ac85597c781d9.tar.gz 200
+GET https://github.com/grafana/grafonnet/archive/f40876da40d787e9c288de0b547ac85597c781d9.tar.gz 200
+GET https://github.com/jsonnet-libs/docsonnet/archive/cc9df63eaca56f39e8e4e1ce192141333257b08d.tar.gz 200
+GET https://github.com/jsonnet-libs/xtd/archive/0256a910ac71f0f842696d7bca0bf01ea77eb654.tar.gz 200
+bin/jsonnetfmt -i templates/General/ocp-performance-v2.jsonnet
+Building template templates/General/ocp-performance-v2.jsonnet
+mkdir -p rendered/General/
+bin/jsonnet -J ./templates/vendor templates/General/ocp-performance-v2.jsonnet > rendered/General/ocp-performance-v2.json
+Rendered the v2 dashboards with latest grafonnet library
+```
+Rest all operations reamin same as before.
 
 In order to clean up the environment execute `make clean`.
 

assets/ocp-performance/panels.libsonnet

@@ -0,0 +1,52 @@
+local g = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
+
+{
+  timeSeries: {
+    local timeSeries = g.panel.timeSeries,
+    local fieldOverride = g.panel.timeSeries.fieldOverride,
+    local custom = timeSeries.fieldConfig.defaults.custom,
+    local options = timeSeries.options,
+
+    generic(title, unit, targets, gridPos):
+      timeSeries.new(title)
+      + timeSeries.queryOptions.withTargets(targets)
+      + timeSeries.datasource.withUid('$datasource')
+      + timeSeries.standardOptions.withUnit(unit)
+      + timeSeries.gridPos.withX(gridPos.x)
+      + timeSeries.gridPos.withY(gridPos.y)
+      + timeSeries.gridPos.withH(gridPos.h)
+      + timeSeries.gridPos.withW(gridPos.w)
+      + custom.withSpanNulls('false')
+      + options.tooltip.withMode('multi')
+      + options.tooltip.withSort('desc')
+      + options.legend.withDisplayMode('table'),
+
+    genericLegend(title, unit, targets, gridPos):
+      self.generic(title, unit, targets, gridPos)
+      + options.legend.withShowLegend(true)
+      + options.legend.withCalcs([
+        'mean',
+        'max',
+        'min',
+      ])
+      + options.legend.withSortBy('max')
+      + options.legend.withSortDesc(true)
+      + options.legend.withPlacement('bottom'),
+  },
+  stat: {
+    local stat = g.panel.stat,
+    local options = stat.options,
+
+    base(title, targets, gridPos):
+      stat.new(title)
+      + stat.datasource.withUid('$datasource')
+      + stat.queryOptions.withTargets(targets)
+      + stat.gridPos.withX(gridPos.x)
+      + stat.gridPos.withY(gridPos.y)
+      + stat.gridPos.withH(gridPos.h)
+      + stat.gridPos.withW(gridPos.w)
+      + options.reduceOptions.withCalcs([
+        'last',
+      ]),
+  },
+}