Improve reporting and fix bug on constant distribution

Signed-off-by: Fotis Nikolaidis <[email protected]>

CHANGELOG.md

@@ -4,13 +4,17 @@
 
 ### Changed defaults / behaviours
 - Upgrade to Grafana v9.4.7 in order to avoid issues with locking database (https://github.com/grafana/grafana/issues/60703)
+- Change Grafana requirements to 2 CPU and 14 Gi memory.
 - ...
 
 ### New Features & Functionality
 - Upgrade API to Kubernetes v0.27.2. Upgrade all other deps to the latest version.
+- Fixed kubectl-frisbee to monitor multiple pods in parallel.
 - ...
 
 ## Bug Fixes
+- Added --network host to "make docker-build" to fix the network discovery issues.
+- Fix the Constant distribution. It was returning normalized values.
 - ...
 
 ## 1.0.40 \[2023-05-23\]

Makefile

@@ -141,7 +141,7 @@ run: generate fmt vet certs ## Run a controller from your host.
 
 docker-build: ## Build docker image for the Frisbee controller.
 	@echo "===> Build Frisbee Container <==="
-	docker build -t ${IMG} .
+	docker build -t ${IMG} . --network host
 
 docker-run: docker-build ## Build and Run docker image for the Frisbee controller.
 	@echo "===> Run Frisbee Container Locally <==="

api/v1alpha1/type_expressions.go

@@ -161,8 +161,8 @@ func (expr ExprState) GoValuate(state interface{}) (bool, error) {
 
 // +kubebuilder:object:generate=false
 
-// ExprMetricsValidator expressions evaluated with https://regex101.com/r/8JrgyI/1
-var ExprMetricsValidator = regexp.MustCompile(`(?m)^(?P<reducer>\w+)\(\)\s+of\s+query\((?P<dashboardUID>\w+)\/(?P<panelID>\d+)\/(?P<metric>.+),\s+(?P<from>\w+),\s+(?P<to>\w+)\)\s+is\s+(?P<evaluator>\w+)\((?P<params>-*\d*[\.,\s]*\d*)\)\s*(for\s+\((?P<for>\w+)\))*\s*(every\((?P<every>\w+)\))*\s*$`)
+// ExprMetricsValidator expressions evaluated with https://regex101.com/r/bjPwQK/1
+var ExprMetricsValidator = regexp.MustCompile(`(?m)^(?P<reducer>\w+)\(\)\s+of\s+query\((?P<dashboardUID>\w+)\/(?P<panelID>\d+)\/(?P<metric>.+),\s+(?P<from>\w+),\s+(?P<to>\w+)\)\s+is\s+(?P<evaluator>\w+)\((?P<params>-*\d*[\.,\s]*\d*\w*)\)\s*(for\s+\((?P<for>\w+)\))*\s*(every\((?P<every>\w+)\))*\s*$`)
 
 type ExprMetrics string
 

charts/databases/cockroachdb/templates/cluster.yml

@@ -56,15 +56,6 @@ spec:
             set -eum
             cockroach init --insecure
 
-      import-tpcc:
-        container: main
-        command:
-          - /bin/sh   # Run shell
-          - -c        # Read from string
-          - |         # Multi-line str
-            set -eum
-            ./cockroach workload fixtures import tpcc --warehouses=200 --fks=false --checks=false
-
       bitrot:
         container: main
         command:
@@ -99,26 +90,8 @@ spec:
               dd if=/dev/urandom of=${file}.sst seek=256 count=128 bs=1 conv=notrunc
             done
 
-      run-workload:
-        container: main
-        command:
-          - /bin/sh   # Run shell
-          - -c        # Read from string
-          - |         # Multi-line str
-            set -eum
-            ./cockroach workload run tpcc --warehouses=100 --tolerate-errors
-
-
-      test2-import-tpcc:
-        container: main
-        command:
-          - /bin/sh   # Run shell
-          - -c        # Read from string
-          - |         # Multi-line str
-            set -eum
-            ./cockroach workload fixtures import tpcc --warehouses=1
 
-      test2-wait-for-3x-replication:
+      wait-for-3x-replication:
         container: main
         command:
           - /bin/sh   # Run shell
@@ -149,14 +122,4 @@ spec:
 
               echo "Sleep"
               sleep 2
-            done
-
-      test2-run-workload:
-        container: main
-        command:
-          - /bin/sh   # Run shell
-          - -c        # Read from string
-          - |         # Multi-line str
-            set -eum
-
-            ./cockroach workload run tpcc --warehouses=1 --wait=false --histograms=/stats.json --duration=30m
+            done

charts/federated-learning/fedbed/templates/server.yaml

@@ -71,16 +71,15 @@ spec:
       #
       # Push round events to grafana
       #
-
       - name: annotator
-        image: alpine/curl:latest
+        image: icsforth/annotator:latest
         volumeMounts:
           - name: logs
             mountPath: /fl-logs/
         command:
-          - /bin/sh   # Run shell
-          - -c        # Read from string
-          - |         # Multi-line str
+          - /bin/bash
+          - -c
+          - |
             set -eux
 
             export logfile=/fl-logs/server.log
@@ -98,16 +97,24 @@ spec:
 
               annotation=$(echo '{"tags":["app"],"text":"'${EVENTCNT}'"}')
 
-              curl -s -H "Content-Type: application/json" -X POST -d ${annotation} ${GRAFANA}/api/annotations
+              curl --connect-timeout 5 \
+              --max-time 10 \
+              --retry 5 \
+              --retry-delay 0 \
+              --retry-max-time 40 \
+              -H "Content-Type: application/json" \
+              -X POST \
+              -d ${annotation} \
+              ${GRAFANA}/api/annotations
 
               echo -e "\n--"
             done
 
-
-
-
+    #
+    # Block waiting for a specific round
+    #
     callables:
-      wait-for-round: # block waiting for a specific round
+      wait-for-round:
         container: main
         command:
           - /bin/bash