18 changed files with 158 additions and 664 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@ -1 +0,0 @@
-* @0x46616c6b
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -4,31 +4,12 @@ updates:
  - package-ecosystem: "gomod"
    directory: "/"
    schedule:
-      interval: "weekly"
-      day: "friday"
-      time: "09:00"
-      timezone: "Europe/Berlin"
-    groups:
-      gomod:
-        patterns:
-          - "*"
-
+      interval: "daily"
  - package-ecosystem: "docker"
    directory: "/"
    schedule:
-      interval: "weekly"
-      day: "friday"
-      time: "09:00"
-      timezone: "Europe/Berlin"
-
+      interval: "daily"
  - package-ecosystem: "github-actions"
    directory: "/"
    schedule:
-      interval: "weekly"
-      day: "friday"
-      time: "09:00"
-      timezone: "Europe/Berlin"
-    groups:
-      github-actions:
-        patterns:
-          - "*"
+      interval: "daily"
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@ -1,41 +0,0 @@
-name-template: '$RESOLVED_VERSION'
-tag-template: '$RESOLVED_VERSION'
-categories:
-  - title: '🚀 Features'
-    labels:
-      - 'feature'
-      - 'enhancement'
-  - title: '🐛 Bug Fixes'
-    labels:
-      - 'fix'
-      - 'bugfix'
-      - 'bug'
-  - title: '🧹 Maintenance'
-    labels:
-      - 'chore'
-      - 'dependencies'
-version-resolver:
-  major:
-    labels:
-      - 'feature'
-  minor:
-    labels:
-      - 'enhancement'
-  patch:
-    labels:
-      - 'fix'
-      - 'bugfix'
-      - 'bug'
-      - 'chore'
-      - 'dependencies'
-  default: patch
-template: |
-  ## Changes
-  
-  $CHANGES
-  
-  **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...$RESOLVED_VERSION
-
-  ## Docker
-  
-  - `docker pull systemli/prometheus-jitsi-meet-exporter:$RESOLVED_VERSION`
--- a/.github/workflows/integration.yaml
+++ b/.github/workflows/integration.yaml
@ -1,85 +1,38 @@
 name: Integration

-on:
-  push:
-    branches:
-      - main
-  pull_request:
+on: [push]

 jobs:
  test:
    name: Test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
-
+      - uses: actions/checkout@v2
      - name: Setup go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v2.1.3
        with:
-          go-version: "1.17.x"
-
-      - name: Cache Go Dependencies
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-
+          go-version: '1.15.x'
      - name: Vet
-        run: go vet
-
+        run: make vet
      - name: Test
-        run: go test ./...
+        run: make coverage

  build:
    name: Build
-    runs-on: ubuntu-20.04
-    needs:
-      - test
+    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
-
+      - uses: actions/checkout@v2
      - name: Setup go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v2.1.3
        with:
-          go-version: "1.17.x"
-
-      - name: Cache Go Dependencies
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-
+          go-version: '1.15.x'
      - name: Build
-        run: go build ./...
-
-      - name: Docker
-        run: docker build .
-
-  automerge:
-    name: Merge Automatically
-    needs: [test, build]
-    runs-on: ubuntu-20.04
-
-    permissions:
-      pull-requests: write
-      contents: write
+        run: make build

+  docker:
+    name: Docker
+    runs-on: ubuntu-latest
    steps:
-      - name: Obtain Access Token
-        id: acces_token
-        run: |
-          TOKEN="$(npx obtain-github-app-installation-access-token ci ${{ secrets.SYSTEMLI_APP_CREDENTIALS_TOKEN }})"
-          echo "token=$TOKEN" >> $GITHUB_OUTPUT
-
-      - name: Merge
-        uses: fastify/github-action-merge-dependabot@v3
-        with:
-          github-token: ${{ steps.acces_token.outputs.token }}
+      - uses: actions/checkout@v2
+      - name: Docker
+        run: make docker
--- a/.github/workflows/quality.yaml
+++ b/.github/workflows/quality.yaml
@ -1,16 +1,14 @@
 name: Quality

-on:
-  push:
-    branches:
-      - main
-  pull_request:
+on: [push]

 jobs:
  golangci:
    name: GolangCI
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
      - name: GolangCI
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v2
+        with:
+          version: v1.31
--- a/.github/workflows/release-drafter.yaml
+++ b/.github/workflows/release-drafter.yaml
@ -1,18 +0,0 @@
-name: Release Drafter
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  release:
-    name: Update Release
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Publish Release
-        uses: release-drafter/release-drafter@v5
-        with:
-          publish: false
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@ -1,42 +1,71 @@
 name: Release

 on:
-  release:
-    types: [published]
+  push:
+    tags:
+      - '*'

 jobs:
  release:
    name: Release
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
+      - uses: actions/checkout@v2
      - name: Setup go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v2.1.3
        with:
-          go-version: "1.17.x"
-
-      - name: Cache Go Dependencies
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3.0.0
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build Releases
-        uses: goreleaser/goreleaser-action@v5.0.0
-        with:
-          version: latest
-          args: release --rm-dist
+          go-version: '1.15.x'
+      - name: Create release artifacts
+        run: make release
+        env:
+          GOPATH: ${{ github.workspace }}/go
+      - name: Create Github Release
+        id: create_release
+        uses: actions/create-release@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: ${{ github.ref }}
+          draft: false
+          prerelease: false
+      - name: Upload release artifacts (Mac OS amd64)
+        id: upload-release-asset-mac
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: build/prometheus-jitsi-meet-exporter-darwin-amd64
+          asset_name: prometheus-jitsi-meet-exporter-darwin-amd64
+          asset_content_type: application/octet-stream
+      - name: Upload release artifacts (FreeBSD amd64)
+        id: upload-release-asset-freebsd
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: build/prometheus-jitsi-meet-exporter-freebsd-amd64
+          asset_name: prometheus-jitsi-meet-exporter-freebsd-amd64
+          asset_content_type: application/octet-stream
+      - name: Upload release artifacts (Linux amd64)
+        id: upload-release-asset-linux
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: build/prometheus-jitsi-meet-exporter-linux-amd64
+          asset_name: prometheus-jitsi-meet-exporter-linux-amd64
+          asset_content_type: application/octet-stream
+      - name: Upload release artifacts (shasums)
+        id: upload-release-asset-sha512sums
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: build/sha512sums.txt
+          asset_name: sha512sums.txt
+          asset_content_type: application/octet-stream
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-dist
+build
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@ -1,30 +0,0 @@
-before:
-  hooks:
-    - go mod tidy
-builds:
-  - env:
-      - CGO_ENABLED=0
-    goos:
-      - linux
-      - windows
-      - darwin
-    goarm:
-      - "6"
-      - "7"
-    ldflags:
-      - -s -w
-dockers:
-  -
-    goos: linux
-    goarch: amd64
-    image_templates:
-      - "systemli/prometheus-jitsi-meet-exporter:{{ .Tag }}"
-      - "systemli/prometheus-jitsi-meet-exporter:{{ .Major }}"
-      - "systemli/prometheus-jitsi-meet-exporter:{{ .Major }}.{{ .Minor }}"
-      - "systemli/prometheus-jitsi-meet-exporter:latest"
-checksum:
-  name_template: 'checksums.txt'
-snapshot:
-  name_template: "{{ .Tag }}-next"
-changelog:
-  skip: true
--- a/34
+++ b/34
@ -1,30 +1,12 @@
-# syntax=docker/dockerfile:1                                                               
-                                                                                           
-# Build the application from source                                                        
-FROM golang:1.21.4 AS build-stage                                                          
-                                                                                           
-WORKDIR /app                                                                               
-                                                                                           
-COPY go.mod go.sum ./                                                                      
-RUN go mod download                                                                        
-                                                                                           
-COPY *.go ./                                                                               
-                                                                                           
-RUN CGO_ENABLED=0 GOOS=linux go build -o /prometheus-jitsi-meet-exporter
+FROM golang:1.15.8-alpine
+ENV GO111MODULE=on
+WORKDIR /go/src/github.com/systemli/prometheus-jitsi-meet-exporter
+ADD . /go/src/github.com/systemli/prometheus-jitsi-meet-exporter
+RUN go build -o /prometheus-jitsi-meet-exporter

-# Run the tests in the container
-FROM build-stage AS run-test-stage
-RUN go test -v ./...
-
-# Deploy the application binary into a lean image
-FROM gcr.io/distroless/base-debian11 AS build-release-stage
-
-WORKDIR /
-
-COPY --from=build-stage /prometheus-jitsi-meet-exporter /prometheus-jitsi-meet-exporter
+FROM alpine
+WORKDIR /app
+COPY --from=0 /prometheus-jitsi-meet-exporter /prometheus-jitsi-meet-exporter

 EXPOSE 9888
-
-USER nonroot:nonroot
-
 ENTRYPOINT ["/prometheus-jitsi-meet-exporter"]
--- a/44
+++ b/44
@ -0,0 +1,44 @@
+GOCMD        = go
+GOBUILD      = $(GOCMD) build
+GOCLEAN      = $(GOCMD) clean
+GOTEST       = $(GOCMD) test
+GOVET        = $(GOCMD) vet
+GOGET        = $(GOCMD) get
+GOX          = $(GOPATH)/bin/gox
+GOGET        = $(GOCMD) get
+
+GOX_ARGS     = -output="$(BUILD_DIR)/{{.Dir}}-{{.OS}}-{{.Arch}}" -osarch="linux/amd64 darwin/amd64 freebsd/amd64"
+
+BUILD_DIR    = build
+BINARY_NAME  = prometheus-jitsi-meet-exporter
+
+all: clean vet test build
+
+build:
+	$(GOBUILD) -o $(BUILD_DIR)/$(BINARY_NAME) -v
+
+vet:
+	${GOVET} ./...
+
+test:
+	${GOTEST} ./...
+
+coverage:
+	${GOTEST} -coverprofile=coverage.txt -covermode=atomic ./...
+
+clean:
+	$(GOCLEAN)
+	rm -f $(BUILD_DIR)/*
+
+run: build
+	./$(BUILD_DIR)/$(BINARY_NAME)
+
+release:
+	${GOGET} -u github.com/mitchellh/gox
+	${GOX} -ldflags "${LD_FLAGS}" ${GOX_ARGS}
+	shasum -a 512 build/* > build/sha512sums.txt
+
+docker:
+	docker build --rm --force-rm --no-cache -t systemli/prometheus-jitsi-meet-exporter .
+
+.PHONY: all vet test coverage clean build run release docker
--- a/README.md
+++ b/README.md
@ -1,16 +1,17 @@
 # Jitsi Meet Metrics Exporter

-[![Integration](https://github.com/systemli/prometheus-jitsi-meet-exporter/workflows/Integration/badge.svg?branch=main)](https://github.com/systemli/prometheus-jitsi-meet-exporter/workflows/Integration/badge.svg?branch=main) [![Quality](https://github.com/systemli/prometheus-jitsi-meet-exporter/workflows/Quality/badge.svg?branch=main)](https://github.com/systemli/prometheus-jitsi-meet-exporter/workflows/Quality/badge.svg?branch=main) [![Docker Cloud Automated build](https://img.shields.io/docker/cloud/automated/systemli/prometheus-jitsi-meet-exporter)](https://hub.docker.com/r/systemli/prometheus-jitsi-meet-exporter) [![Docker Image Size (latest semver)](https://img.shields.io/docker/image-size/systemli/prometheus-jitsi-meet-exporter)](https://hub.docker.com/r/systemli/prometheus-jitsi-meet-exporter)
+[![Integration](https://github.com/systemli/prometheus-jitsi-meet-exporter/workflows/Integration/badge.svg?branch=master)](https://github.com/systemli/prometheus-jitsi-meet-exporter/workflows/Integration/badge.svg?branch=master) [![Quality](https://github.com/systemli/prometheus-jitsi-meet-exporter/workflows/Quality/badge.svg?branch=master)](https://github.com/systemli/prometheus-jitsi-meet-exporter/workflows/Quality/badge.svg?branch=master) [![Docker Cloud Automated build](https://img.shields.io/docker/cloud/automated/systemli/prometheus-jitsi-meet-exporter)](https://hub.docker.com/r/systemli/prometheus-jitsi-meet-exporter) [![Docker Image Size (latest semver)](https://img.shields.io/docker/image-size/systemli/prometheus-jitsi-meet-exporter)](https://hub.docker.com/r/systemli/prometheus-jitsi-meet-exporter)

 Prometheus Exporter for Jitsi Meet written in Go. Based on [Jitsi Meet Exporter](https://git.autistici.org/ai3/tools/jitsi-prometheus-exporter) from [Autistici](https://www.autistici.org/)

-There's multiple different [statistics endpoint that can be exposed by jitsi](https://github.com/jitsi/jitsi-videobridge/blob/master/doc/statistics.md) (like /stats and /colibri/stats); you can configure the used URL with the `videobridge-url`.
+There's multiple different statistics endpoint that can be exposed by jitsi (like /stats and /colibri/stats); you can configure the used URL with the `videobridge-url`.
 The exporter will handle both of them, but some metrics that aren't exposed may be reported as 0.

 ## Usage

 ```
-go install github.com/systemli/prometheus-jitsi-meet-exporter@latest
+go get github.com/systemli/prometheus-jitsi-meet-exporter
+go install github.com/systemli/prometheus-jitsi-meet-exporter
 $GOPATH/bin/prometheus-jitsi-meet-exporter
 ```

@ -29,7 +30,7 @@ Example Playbook:
 ### Docker

 ```
-docker run -p 9888:9888 systemli/prometheus-jitsi-meet-exporter:latest -videobridge-url http://jitsi:8080/colibri/stats
+docker run -p 9888:9888 systemli/prometheus-jitsi-meet-exporter:latest -videobridge-url http://jitsi:8888/stats 
 ```

 ## Dashboard
@ -82,9 +83,6 @@ jitsi_videochannels 0
 # HELP jitsi_conferences The current number of conferences.
 # TYPE jitsi_conferences gauge
 jitsi_conferences 0
-# HELP jitsi_p2p_conferences The current number of p2p conferences.
-# TYPE jitsi_p2p_conferences gauge
-jitsi_p2p_conferences 1
 # HELP jitsi_participants The current number of participants.
 # TYPE jitsi_participants gauge
 jitsi_participants 0
@ -124,42 +122,6 @@ jitsi_total_colibri_web_socket_messages_received 0
 # HELP jitsi_total_colibri_web_socket_messages_sent The total number messages sent through COLIBRI web sockets.
 # TYPE jitsi_total_colibri_web_socket_messages_sent counter
 jitsi_total_colibri_web_socket_messages_sent 0
-# HELP jitsi_octo_version The current running OCTO version
-# TYPE jitsi_octo_version gauge
-jitsi_octo_version 0
-# HELP jitsi_octo_conferences The current number of OCTO conferences.
-# TYPE jitsi_octo_conferences gauge
-jitsi_octo_conferences 0
-# HELP jitsi_octo_endpoints The current number of OCTO endpoints.
-# TYPE jitsi_octo_endpoints gauge
-jitsi_octo_endpoints 0
-# HELP jitsi_octo_receive_bitrate The total receiving bitrate for the OCTO video bridge in kilobits per second.
-# TYPE jitsi_octo_receive_bitrate gauge
-jitsi_octo_receive_bitrate 0
-# HELP jitsi_octo_send_bitrate The total outgoing bitrate for the OCTO video bridge in kilobits per second.
-# TYPE jitsi_octo_send_bitrate gauge
-jitsi_octo_send_bitrate 0
-# HELP jitsi_octo_receive_packet_rate The total incoming packet rate for the OCTO video bridge in packets per second.
-# TYPE jitsi_octo_receive_packet_rate gauge
-jitsi_octo_receive_packet_rate 0
-# HELP jitsi_octo_send_packet_rate The total outgoing packet rate for the OCTO video bridge in packets per second.
-# TYPE jitsi_octo_send_packet_rate gauge
-jitsi_octo_send_packet_rate 0
-# HELP jitsi_total_bytes_received_octo The total incoming bit rate for the OCTO video bridge in bytes per second.
-# TYPE jitsi_total_bytes_received_octo gauge
-jitsi_total_bytes_received_octo 0
-# HELP jitsi_total_bytes_sent_octo The total outgoing bit rate for the OCTO video bridge in bytes per second.
-# TYPE jitsi_total_bytes_sent_octo gauge
-jitsi_total_bytes_sent_octo 0
-# HELP jitsi_total_packets_dropped_octo The total of dropped packets handled by the OCTO video bridge.
-# TYPE jitsi_total_packets_dropped_octo gauge
-jitsi_total_packets_dropped_octo 0
-# HELP jitsi_total_packets_received_octo The total of incoming dropped packets handled by the OCTO video bridge.
-# TYPE jitsi_total_packets_received_octo gauge
-jitsi_total_packets_received_octo 0
-# HELP jitsi_total_packets_sent_octo The total of sent dropped packets handled by the OCTO video bridge.
-# TYPE jitsi_total_packets_sent_octo gauge
-jitsi_total_packets_sent_octo 0
 ```

 ## License
--- a/dashboards/jitsi-meet-system.json
+++ b/dashboards/jitsi-meet-system.json
@ -59,7 +59,7 @@
  "gnetId": 12282,
  "graphTooltip": 1,
  "id": null,
-  "iteration": 1613598823724,
+  "iteration": 1611864000587,
  "links": [],
  "panels": [
    {
@ -945,7 +945,7 @@
      "renderer": "flot",
      "seriesOverrides": [],
      "spaceLength": 10,
-      "stack": true,
+      "stack": false,
      "steppedLine": false,
      "targets": [
        {
@ -953,12 +953,6 @@
          "interval": "",
          "legendFormat": "conferences",
          "refId": "A"
-        },
-        {
-          "expr": "jitsi_p2p_conferences{instance=~\"$instance.*\"}",
-          "interval": "",
-          "legendFormat": "p2p conferences",
-          "refId": "B"
        }
      ],
      "thresholds": [],
@ -2348,111 +2342,6 @@
            "align": false,
            "alignLevel": null
          }
-        },
-        {
-          "aliasColors": {},
-          "bars": false,
-          "dashLength": 10,
-          "dashes": false,
-          "datasource": "${DS_PROMETHEUS}",
-          "description": "Stress Level reported to Jicofo by the videobridge.",
-          "fieldConfig": {
-            "defaults": {
-              "color": {},
-              "custom": {},
-              "thresholds": {
-                "mode": "absolute",
-                "steps": []
-              },
-              "unit": "short"
-            },
-            "overrides": []
-          },
-          "fill": 1,
-          "fillGradient": 0,
-          "gridPos": {
-            "h": 8,
-            "w": 12,
-            "x": 12,
-            "y": 67
-          },
-          "hiddenSeries": false,
-          "id": 51,
-          "legend": {
-            "alignAsTable": true,
-            "avg": true,
-            "current": true,
-            "max": true,
-            "min": true,
-            "show": true,
-            "total": false,
-            "values": true
-          },
-          "lines": true,
-          "linewidth": 1,
-          "nullPointMode": "null",
-          "options": {
-            "alertThreshold": true
-          },
-          "percentage": false,
-          "pluginVersion": "7.4.2",
-          "pointradius": 2,
-          "points": false,
-          "renderer": "flot",
-          "seriesOverrides": [],
-          "spaceLength": 10,
-          "stack": false,
-          "steppedLine": false,
-          "targets": [
-            {
-              "expr": "jitsi_stress_level{instance=~\"$instance.*\"}",
-              "instant": false,
-              "interval": "",
-              "legendFormat": "stress level",
-              "queryType": "randomWalk",
-              "refId": "A"
-            }
-          ],
-          "thresholds": [],
-          "timeFrom": null,
-          "timeRegions": [],
-          "timeShift": null,
-          "title": "Videobridge Stress Level",
-          "tooltip": {
-            "shared": true,
-            "sort": 0,
-            "value_type": "individual"
-          },
-          "type": "graph",
-          "xaxis": {
-            "buckets": null,
-            "mode": "time",
-            "name": null,
-            "show": true,
-            "values": []
-          },
-          "yaxes": [
-            {
-              "format": "short",
-              "label": null,
-              "logBase": 1,
-              "max": null,
-              "min": "0",
-              "show": true
-            },
-            {
-              "format": "short",
-              "label": null,
-              "logBase": 1,
-              "max": null,
-              "min": null,
-              "show": true
-            }
-          ],
-          "yaxis": {
-            "align": false,
-            "alignLevel": null
-          }
        }
      ],
      "title": "Additional Metrics",
@ -2510,5 +2399,5 @@
  "timezone": "",
  "title": "Jitsi Meet & System",
  "uid": "IJXK9Q6Wz",
-  "version": 5
+  "version": 2
 }
--- a/dashboards/jitsi-meet.json
+++ b/dashboards/jitsi-meet.json
@ -53,7 +53,7 @@
  "gnetId": 12098,
  "graphTooltip": 1,
  "id": null,
-  "iteration": 1612608944252,
+  "iteration": 1611864152470,
  "links": [],
  "panels": [
    {
@ -702,7 +702,7 @@
      "renderer": "flot",
      "seriesOverrides": [],
      "spaceLength": 10,
-      "stack": true,
+      "stack": false,
      "steppedLine": false,
      "targets": [
        {
@ -710,12 +710,6 @@
          "interval": "",
          "legendFormat": "conferences",
          "refId": "A"
-        },
-        {
-          "expr": "jitsi_p2p_conferences{instance=~\"$instance.*\"}",
-          "interval": "",
-          "legendFormat": "p2p conferences",
-          "refId": "B"
        }
      ],
      "thresholds": [],
@ -2162,5 +2156,5 @@
  "timezone": "",
  "title": "Jitsi Meet",
  "uid": "wX13E8RGz",
-  "version": 3
+  "version": 1
 }
--- a/go.mod
+++ b/go.mod
@ -1,5 +1,5 @@
 module github.com/systemli/prometheus-jitsi-meet-exporter

-go 1.17
+go 1.14

-require github.com/google/go-cmp v0.6.0
+require github.com/google/go-cmp v0.5.4
--- a/go.sum
+++ b/go.sum
@ -1,2 +1,4 @@
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M=
+github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
--- a/main.go
+++ b/main.go
@ -10,7 +10,7 @@ import (

 var (
 	addr           = flag.String("web.listen-address", ":9888", "Address on which to expose metrics and web interface.")
-	videoBridgeURL = flag.String("videobridge-url", "http://localhost:8080/colibri/stats", "Jitsi Videobridge /stats URL to scrape")
+	videoBridgeURL = flag.String("videobridge-url", "http://localhost:8888/stats", "Jitsi Videobridge /stats URL to scrape")
 )

 type videoBridgeStats struct {
@ -31,7 +31,6 @@ type videoBridgeStats struct {
 	P2PConferences                        int     `json:"p2p_conferences"`
 	Participants                          int     `json:"participants"`
 	Videostreams                          int     `json:"videostreams"`
-	StressLevel                           float64 `json:"stress_level"`
 	TotalLossControlledParticipantSeconds int     `json:"total_loss_controlled_participant_seconds"`
 	TotalLossLimitedParticipantSeconds    int     `json:"total_loss_limited_participant_seconds"`
 	TotalLossDegradedParticipantSeconds   int     `json:"total_loss_degraded_participant_seconds"`
@ -45,22 +44,6 @@ type videoBridgeStats struct {
 	TotalColibriWebSocketMessagesReceived int     `json:"total_colibri_web_socket_messages_received"`
 	TotalColibriWebSocketMessagesSent     int     `json:"total_colibri_web_socket_messages_sent"`
 	TotalParticipants                     int     `json:"total_participants"`
-	OctoVersion                           int     `json:"octo_version"`
-	OctoConferences                       int     `json:"octo_conferences"`
-	OctoEndpoints                         int     `json:"octo_endpoints"`
-	OctoReceiveBitrate                    float64 `json:"octo_receive_bitrate"`
-	OctoReceivePacketRate                 float64 `json:"octo_receive_packet_rate"`
-	OctoSendBitrate                       float64 `json:"octo_send_bitrate"`
-	OctoSendPacketRate                    float64 `json:"octo_send_packet_rate"`
-	TotalBytesReceivedOcto                int     `json:"total_bytes_received_octo"`
-	TotalBytesSentOcto                    int     `json:"total_bytes_sent_octo"`
-	TotalPacketsDroppedOcto               int     `json:"total_packets_dropped_octo"`
-	TotalPacketsReceivedOcto              int     `json:"total_packets_received_octo"`
-	TotalPacketsSentOcto                  int     `json:"total_packets_sent_octo"`
-	TotalICESucceededRelayed              int     `json:"total_ice_succeeded_relayed"`
-	TotalICESucceeded                     int     `json:"total_ice_succeeded"`
-	TotalICESucceededTCP                  int     `json:"total_ice_succeeded_tcp"`
-	TotalICEFailed                        int     `json:"total_ice_failed"`
 }

 var tpl = template.Must(template.New("stats").Parse(`# HELP jitsi_threads The number of Java threads that the video bridge is using.
@ -108,15 +91,9 @@ jitsi_p2p_conferences {{.P2PConferences}}
 # HELP jitsi_participants The current number of participants.
 # TYPE jitsi_participants gauge
 jitsi_participants {{.Participants}}
-# HELP jitsi_total_participants Total participants since running.
-# TYPE jitsi_total_participants gauge
-jitsi_total_participants {{.TotalParticipants}}
 # HELP jitsi_videostreams An estimation of the number of current video streams forwarded by the bridge.
 # TYPE jitsi_videostreams gauge
 jitsi_videostreams {{.Videostreams}}
-# HELP jitsi_stress_level Stress Level reported to Jicofo by the videobridge.
-# TYPE jitsi_stress_level gauge
-jitsi_stress_level {{.StressLevel}}
 # HELP jitsi_total_loss_controlled_participant_seconds The total number of participant-seconds that are loss-controlled.
 # TYPE jitsi_total_loss_controlled_participant_seconds counter
 jitsi_total_loss_controlled_participant_seconds {{.TotalLossControlledParticipantSeconds}}
@ -153,60 +130,6 @@ jitsi_total_colibri_web_socket_messages_received {{.TotalColibriWebSocketMessage
 # HELP jitsi_total_colibri_web_socket_messages_sent The total number messages sent through COLIBRI web sockets.
 # TYPE jitsi_total_colibri_web_socket_messages_sent counter
 jitsi_total_colibri_web_socket_messages_sent {{.TotalColibriWebSocketMessagesSent}}
-# HELP jitsi_octo_version The current running OCTO version
-# TYPE jitsi_octo_version gauge
-jitsi_octo_version {{.OctoVersion}}
-# HELP jitsi_octo_conferences The current number of OCTO conferences.
-# TYPE jitsi_octo_conferences gauge
-jitsi_octo_conferences {{.OctoConferences}}
-# HELP jitsi_octo_endpoints The current number of OCTO endpoints.
-# TYPE jitsi_octo_endpoints gauge
-jitsi_octo_endpoints {{.OctoEndpoints}}
-# HELP jitsi_octo_receive_bitrate The total receiving bitrate for the OCTO video bridge in kilobits per second.
-# TYPE jitsi_octo_receive_bitrate gauge
-jitsi_octo_receive_bitrate {{.OctoReceiveBitrate}}
-# HELP jitsi_octo_send_bitrate The total outgoing bitrate for the OCTO video bridge in kilobits per second.
-# TYPE jitsi_octo_send_bitrate gauge
-jitsi_octo_send_bitrate {{.OctoSendBitrate}}
-# HELP jitsi_octo_receive_packet_rate The total incoming packet rate for the OCTO video bridge in packets per second.
-# TYPE jitsi_octo_receive_packet_rate gauge
-jitsi_octo_receive_packet_rate {{.OctoReceivePacketRate}}
-# HELP jitsi_octo_send_packet_rate The total outgoing packet rate for the OCTO video bridge in packets per second.
-# TYPE jitsi_octo_send_packet_rate gauge
-jitsi_octo_send_packet_rate {{.OctoSendPacketRate}}
-# HELP jitsi_total_bytes_received_octo The total incoming bit rate for the OCTO video bridge in bytes per second.
-# TYPE jitsi_total_bytes_received_octo gauge
-jitsi_total_bytes_received_octo {{.TotalBytesReceivedOcto}}
-# HELP jitsi_total_bytes_sent_octo The total outgoing bit rate for the OCTO video bridge in bytes per second.
-# TYPE jitsi_total_bytes_sent_octo gauge
-jitsi_total_bytes_sent_octo {{.TotalBytesSentOcto}}
-# HELP jitsi_total_packets_dropped_octo The total of dropped packets handled by the OCTO video bridge.
-# TYPE jitsi_total_packets_dropped_octo gauge
-jitsi_total_packets_dropped_octo {{.TotalPacketsDroppedOcto}}
-# HELP jitsi_total_packets_received_octo The total of incoming dropped packets handled by the OCTO video bridge.
-# TYPE jitsi_total_packets_received_octo gauge
-jitsi_total_packets_received_octo {{.TotalPacketsReceivedOcto}}
-# HELP jitsi_total_packets_sent_octo The total of sent dropped packets handled by the OCTO video bridge.
-# TYPE jitsi_total_packets_sent_octo gauge
-jitsi_total_packets_sent_octo {{.TotalPacketsSentOcto}}
-# HELP total_ice_succeeded_relayed The total number of times an ICE Agent succeeded and the selected candidate pair included a relayed candidate.
-# TYPE total_ice_succeeded_relayed gauge
-total_ice_succeeded_relayed {{.TotalICESucceededRelayed}}
-# HELP total_ice_succeeded The total number of times an ICE Agent succeeded.
-# TYPE total_ice_succeeded gauge
-total_ice_succeeded {{.TotalICESucceeded}}
-# HELP total_ice_succeeded_tcp The total number of times an ICE Agent succeeded and the selected candidate was a TCP candidate.
-# TYPE total_ice_succeeded_tcp gauge
-total_ice_succeeded_tcp {{.TotalICESucceededTCP}}
-# HELP total_ice_failed The total number of times an ICE Agent failed to establish connectivity.
-# TYPE total_ice_failed gauge
-total_ice_failed {{.TotalICEFailed}}
-# HELP jitsi_conference_sizes Distribution of conference sizes
-# TYPE jitsi_conference_sizes gauge
-{{ range $key, $value := .ConferenceSizes -}}
-jitsi_conference_sizes{conference_size="{{$key}}"} {{ $value }}
-{{ end -}}
-
 `))

 type handler struct {
@ -238,9 +161,6 @@ func main() {
 	flag.Parse()

 	http.Handle("/metrics", handler{sourceURL: *videoBridgeURL})
-	http.HandleFunc("/health", func(w http.ResponseWriter, req *http.Request) {
-		_, _ = w.Write([]byte(`ok`))
-	})
 	if err := http.ListenAndServe(*addr, nil); err != nil {
 		log.Fatal(err)
 	}
--- a/main_test.go
+++ b/main_test.go
@ -68,15 +68,9 @@ jitsi_p2p_conferences 1
 # HELP jitsi_participants The current number of participants.
 # TYPE jitsi_participants gauge
 jitsi_participants 4
-# HELP jitsi_total_participants Total participants since running.
-# TYPE jitsi_total_participants gauge
-jitsi_total_participants 18
 # HELP jitsi_videostreams An estimation of the number of current video streams forwarded by the bridge.
 # TYPE jitsi_videostreams gauge
 jitsi_videostreams 0
-# HELP jitsi_stress_level Stress Level reported to Jicofo by the videobridge.
-# TYPE jitsi_stress_level gauge
-jitsi_stress_level 0
 # HELP jitsi_total_loss_controlled_participant_seconds The total number of participant-seconds that are loss-controlled.
 # TYPE jitsi_total_loss_controlled_participant_seconds counter
 jitsi_total_loss_controlled_participant_seconds 0
@ -113,78 +107,6 @@ jitsi_total_colibri_web_socket_messages_received 0
 # HELP jitsi_total_colibri_web_socket_messages_sent The total number messages sent through COLIBRI web sockets.
 # TYPE jitsi_total_colibri_web_socket_messages_sent counter
 jitsi_total_colibri_web_socket_messages_sent 0
-# HELP jitsi_octo_version The current running OCTO version
-# TYPE jitsi_octo_version gauge
-jitsi_octo_version 0
-# HELP jitsi_octo_conferences The current number of OCTO conferences.
-# TYPE jitsi_octo_conferences gauge
-jitsi_octo_conferences 0
-# HELP jitsi_octo_endpoints The current number of OCTO endpoints.
-# TYPE jitsi_octo_endpoints gauge
-jitsi_octo_endpoints 0
-# HELP jitsi_octo_receive_bitrate The total receiving bitrate for the OCTO video bridge in kilobits per second.
-# TYPE jitsi_octo_receive_bitrate gauge
-jitsi_octo_receive_bitrate 0
-# HELP jitsi_octo_send_bitrate The total outgoing bitrate for the OCTO video bridge in kilobits per second.
-# TYPE jitsi_octo_send_bitrate gauge
-jitsi_octo_send_bitrate 0
-# HELP jitsi_octo_receive_packet_rate The total incoming packet rate for the OCTO video bridge in packets per second.
-# TYPE jitsi_octo_receive_packet_rate gauge
-jitsi_octo_receive_packet_rate 0
-# HELP jitsi_octo_send_packet_rate The total outgoing packet rate for the OCTO video bridge in packets per second.
-# TYPE jitsi_octo_send_packet_rate gauge
-jitsi_octo_send_packet_rate 0
-# HELP jitsi_total_bytes_received_octo The total incoming bit rate for the OCTO video bridge in bytes per second.
-# TYPE jitsi_total_bytes_received_octo gauge
-jitsi_total_bytes_received_octo 0
-# HELP jitsi_total_bytes_sent_octo The total outgoing bit rate for the OCTO video bridge in bytes per second.
-# TYPE jitsi_total_bytes_sent_octo gauge
-jitsi_total_bytes_sent_octo 0
-# HELP jitsi_total_packets_dropped_octo The total of dropped packets handled by the OCTO video bridge.
-# TYPE jitsi_total_packets_dropped_octo gauge
-jitsi_total_packets_dropped_octo 0
-# HELP jitsi_total_packets_received_octo The total of incoming dropped packets handled by the OCTO video bridge.
-# TYPE jitsi_total_packets_received_octo gauge
-jitsi_total_packets_received_octo 0
-# HELP jitsi_total_packets_sent_octo The total of sent dropped packets handled by the OCTO video bridge.
-# TYPE jitsi_total_packets_sent_octo gauge
-jitsi_total_packets_sent_octo 0
-# HELP total_ice_succeeded_relayed The total number of times an ICE Agent succeeded and the selected candidate pair included a relayed candidate.
-# TYPE total_ice_succeeded_relayed gauge
-total_ice_succeeded_relayed 0
-# HELP total_ice_succeeded The total number of times an ICE Agent succeeded.
-# TYPE total_ice_succeeded gauge
-total_ice_succeeded 0
-# HELP total_ice_succeeded_tcp The total number of times an ICE Agent succeeded and the selected candidate was a TCP candidate.
-# TYPE total_ice_succeeded_tcp gauge
-total_ice_succeeded_tcp 0
-# HELP total_ice_failed The total number of times an ICE Agent failed to establish connectivity.
-# TYPE total_ice_failed gauge
-total_ice_failed 0
-# HELP jitsi_conference_sizes Distribution of conference sizes
-# TYPE jitsi_conference_sizes gauge
-jitsi_conference_sizes{conference_size="0"} 0
-jitsi_conference_sizes{conference_size="1"} 1
-jitsi_conference_sizes{conference_size="2"} 0
-jitsi_conference_sizes{conference_size="3"} 1
-jitsi_conference_sizes{conference_size="4"} 0
-jitsi_conference_sizes{conference_size="5"} 0
-jitsi_conference_sizes{conference_size="6"} 0
-jitsi_conference_sizes{conference_size="7"} 0
-jitsi_conference_sizes{conference_size="8"} 0
-jitsi_conference_sizes{conference_size="9"} 0
-jitsi_conference_sizes{conference_size="10"} 0
-jitsi_conference_sizes{conference_size="11"} 0
-jitsi_conference_sizes{conference_size="12"} 0
-jitsi_conference_sizes{conference_size="13"} 0
-jitsi_conference_sizes{conference_size="14"} 0
-jitsi_conference_sizes{conference_size="15"} 0
-jitsi_conference_sizes{conference_size="16"} 0
-jitsi_conference_sizes{conference_size="17"} 0
-jitsi_conference_sizes{conference_size="18"} 0
-jitsi_conference_sizes{conference_size="19"} 0
-jitsi_conference_sizes{conference_size="20"} 0
-jitsi_conference_sizes{conference_size="21"} 0
 `,
 		},
 		{
@ -200,13 +122,6 @@ jitsi_conference_sizes{conference_size="21"} 0
  "largest_conference": 0,
  "loss_rate_download": 0.5,
  "loss_rate_upload": 0.5,
-  "octo_conferences": 0,
-  "octo_endpoints": 0,
-  "octo_receive_bitrate": 0.0,
-  "octo_receive_packet_rate": 0,
-  "octo_send_bitrate": 0.0,
-  "octo_send_packet_rate": 0,
-  "octo_version": 1,
  "packet_rate_download": 0,
  "packet_rate_upload": 0,
  "participants": 0,
@ -214,14 +129,11 @@ jitsi_conference_sizes{conference_size="21"} 0
  "relay_id": "10.0.0.5:4096",
  "rtp_loss": 0,
  "rtt_aggregate": 0,
-  "stress_level": 0.6,
  "threads": 59,
  "total_bytes_received": 257628359,
  "total_bytes_received_octo": 0,
-  "total_bytes_received_octo": 0,
  "total_bytes_sent": 257754048,
  "total_bytes_sent_octo": 0,
-  "total_bytes_sent_octo": 0,
  "total_colibri_web_socket_messages_received": 0,
  "total_colibri_web_socket_messages_sent": 0,
  "total_conference_seconds": 470,
@ -232,21 +144,17 @@ jitsi_conference_sizes{conference_size="21"} 0
  "total_failed_conferences": 0,
  "total_ice_failed": 0,
  "total_ice_succeeded": 2,
-  "total_ice_succeeded_tcp": 1,
+  "total_ice_succeeded_tcp": 0,
  "total_loss_controlled_participant_seconds": 847,
  "total_loss_degraded_participant_seconds": 1,
  "total_loss_limited_participant_seconds": 0,
  "total_packets_dropped_octo": 0,
-  "total_packets_dropped_octo": 0,
  "total_packets_received": 266644,
  "total_packets_received_octo": 0,
-  "total_packets_received_octo": 0,
  "total_packets_sent": 266556,
  "total_packets_sent_octo": 0,
-  "total_packets_sent_octo": 0,
  "total_partially_failed_conferences": 0,
  "total_participants": 2,
-  "total_ice_succeeded_relayed": 3,
  "videochannels": 0,
  "videostreams": 0
 }`,
@ -295,15 +203,9 @@ jitsi_p2p_conferences 0
 # HELP jitsi_participants The current number of participants.
 # TYPE jitsi_participants gauge
 jitsi_participants 0
-# HELP jitsi_total_participants Total participants since running.
-# TYPE jitsi_total_participants gauge
-jitsi_total_participants 2
 # HELP jitsi_videostreams An estimation of the number of current video streams forwarded by the bridge.
 # TYPE jitsi_videostreams gauge
 jitsi_videostreams 0
-# HELP jitsi_stress_level Stress Level reported to Jicofo by the videobridge.
-# TYPE jitsi_stress_level gauge
-jitsi_stress_level 0.6
 # HELP jitsi_total_loss_controlled_participant_seconds The total number of participant-seconds that are loss-controlled.
 # TYPE jitsi_total_loss_controlled_participant_seconds counter
 jitsi_total_loss_controlled_participant_seconds 847
@ -340,78 +242,6 @@ jitsi_total_colibri_web_socket_messages_received 0
 # HELP jitsi_total_colibri_web_socket_messages_sent The total number messages sent through COLIBRI web sockets.
 # TYPE jitsi_total_colibri_web_socket_messages_sent counter
 jitsi_total_colibri_web_socket_messages_sent 0
-# HELP jitsi_octo_version The current running OCTO version
-# TYPE jitsi_octo_version gauge
-jitsi_octo_version 1
-# HELP jitsi_octo_conferences The current number of OCTO conferences.
-# TYPE jitsi_octo_conferences gauge
-jitsi_octo_conferences 0
-# HELP jitsi_octo_endpoints The current number of OCTO endpoints.
-# TYPE jitsi_octo_endpoints gauge
-jitsi_octo_endpoints 0
-# HELP jitsi_octo_receive_bitrate The total receiving bitrate for the OCTO video bridge in kilobits per second.
-# TYPE jitsi_octo_receive_bitrate gauge
-jitsi_octo_receive_bitrate 0
-# HELP jitsi_octo_send_bitrate The total outgoing bitrate for the OCTO video bridge in kilobits per second.
-# TYPE jitsi_octo_send_bitrate gauge
-jitsi_octo_send_bitrate 0
-# HELP jitsi_octo_receive_packet_rate The total incoming packet rate for the OCTO video bridge in packets per second.
-# TYPE jitsi_octo_receive_packet_rate gauge
-jitsi_octo_receive_packet_rate 0
-# HELP jitsi_octo_send_packet_rate The total outgoing packet rate for the OCTO video bridge in packets per second.
-# TYPE jitsi_octo_send_packet_rate gauge
-jitsi_octo_send_packet_rate 0
-# HELP jitsi_total_bytes_received_octo The total incoming bit rate for the OCTO video bridge in bytes per second.
-# TYPE jitsi_total_bytes_received_octo gauge
-jitsi_total_bytes_received_octo 0
-# HELP jitsi_total_bytes_sent_octo The total outgoing bit rate for the OCTO video bridge in bytes per second.
-# TYPE jitsi_total_bytes_sent_octo gauge
-jitsi_total_bytes_sent_octo 0
-# HELP jitsi_total_packets_dropped_octo The total of dropped packets handled by the OCTO video bridge.
-# TYPE jitsi_total_packets_dropped_octo gauge
-jitsi_total_packets_dropped_octo 0
-# HELP jitsi_total_packets_received_octo The total of incoming dropped packets handled by the OCTO video bridge.
-# TYPE jitsi_total_packets_received_octo gauge
-jitsi_total_packets_received_octo 0
-# HELP jitsi_total_packets_sent_octo The total of sent dropped packets handled by the OCTO video bridge.
-# TYPE jitsi_total_packets_sent_octo gauge
-jitsi_total_packets_sent_octo 0
-# HELP total_ice_succeeded_relayed The total number of times an ICE Agent succeeded and the selected candidate pair included a relayed candidate.
-# TYPE total_ice_succeeded_relayed gauge
-total_ice_succeeded_relayed 3
-# HELP total_ice_succeeded The total number of times an ICE Agent succeeded.
-# TYPE total_ice_succeeded gauge
-total_ice_succeeded 2
-# HELP total_ice_succeeded_tcp The total number of times an ICE Agent succeeded and the selected candidate was a TCP candidate.
-# TYPE total_ice_succeeded_tcp gauge
-total_ice_succeeded_tcp 1
-# HELP total_ice_failed The total number of times an ICE Agent failed to establish connectivity.
-# TYPE total_ice_failed gauge
-total_ice_failed 0
-# HELP jitsi_conference_sizes Distribution of conference sizes
-# TYPE jitsi_conference_sizes gauge
-jitsi_conference_sizes{conference_size="0"} 0
-jitsi_conference_sizes{conference_size="1"} 0
-jitsi_conference_sizes{conference_size="2"} 0
-jitsi_conference_sizes{conference_size="3"} 0
-jitsi_conference_sizes{conference_size="4"} 0
-jitsi_conference_sizes{conference_size="5"} 0
-jitsi_conference_sizes{conference_size="6"} 0
-jitsi_conference_sizes{conference_size="7"} 0
-jitsi_conference_sizes{conference_size="8"} 0
-jitsi_conference_sizes{conference_size="9"} 0
-jitsi_conference_sizes{conference_size="10"} 0
-jitsi_conference_sizes{conference_size="11"} 0
-jitsi_conference_sizes{conference_size="12"} 0
-jitsi_conference_sizes{conference_size="13"} 0
-jitsi_conference_sizes{conference_size="14"} 0
-jitsi_conference_sizes{conference_size="15"} 0
-jitsi_conference_sizes{conference_size="16"} 0
-jitsi_conference_sizes{conference_size="17"} 0
-jitsi_conference_sizes{conference_size="18"} 0
-jitsi_conference_sizes{conference_size="19"} 0
-jitsi_conference_sizes{conference_size="20"} 0
-jitsi_conference_sizes{conference_size="21"} 0
 `,
 		},
 	}