Add SNMP test tool

Add SNMP receiver
Fix job dependency in Release.yml
2025-07-19 19:31:41 +02:00 · 2023-12-08 16:58:49 +01:00 · 2023-12-08 15:07:15 +01:00 · 2023-12-04 12:26:57 +01:00 · 2023-12-04 12:21:26 +01:00 · 2023-10-10 11:57:13 +02:00
140 changed files with 15430 additions and 3915 deletions
--- a/.github/ci-config.json
+++ b/.github/ci-config.json
@@ -3,6 +3,6 @@
  "collectors" : ".github/ci-collectors.json",
  "receivers" : ".github/ci-receivers.json",
  "router" : ".github/ci-router.json",
-  "interval": 5,
-  "duration": 1
+  "interval": "5s",
+  "duration": "1s"
 }
--- a/.github/ci-receivers.json
+++ b/.github/ci-receivers.json
@@ -1 +1 @@
-[]
+{}
--- a/.github/ci-sinks.json
+++ b/.github/ci-sinks.json
@@ -1,6 +1,8 @@
-[
-  {
+{
+  "testoutput" : {
    "type" : "stdout",
-    "meta_as_tags" : true
+    "meta_as_tags" : [
+      "unit"
+    ]
  }
-]
+}
--- a/.github/workflows/Release.yml
+++ b/.github/workflows/Release.yml
@@ -0,0 +1,261 @@
+# See: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions
+
+# Workflow name
+name: Release
+
+# Run on tag push
+on:
+ push:
+  tags:
+  - '**'
+ workflow_dispatch:
+
+jobs:
+
+  #
+  # Build on AlmaLinux 8 using go-toolset
+  #
+  AlmaLinux-RPM-build:
+    runs-on: ubuntu-latest
+    # See: https://hub.docker.com/_/almalinux
+    container: almalinux:8
+    # The job outputs link to the outputs of the 'rpmrename' step
+    # Only job outputs can be used in child jobs
+    outputs:
+      rpm : ${{steps.rpmrename.outputs.RPM}}
+      srpm : ${{steps.rpmrename.outputs.SRPM}}
+    steps:
+
+    # Use dnf to install development packages
+    - name: Install development packages
+      run: |
+          dnf --assumeyes group install "Development Tools" "RPM Development Tools"
+          dnf --assumeyes install wget openssl-devel diffutils delve which
+
+    # Checkout git repository and submodules
+    # fetch-depth must be 0 to use git describe
+    # See: https://github.com/marketplace/actions/checkout
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive
+        fetch-depth: 0
+
+    # Use dnf to install build dependencies
+    - name: Install build dependencies
+      run: |
+          dnf --assumeyes install \
+              http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/golang-1.20.6-2.module_el8+658+f14b2092.x86_64.rpm \
+              http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/golang-bin-1.20.6-2.module_el8+658+f14b2092.x86_64.rpm \
+              http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/golang-src-1.20.6-2.module_el8+658+f14b2092.noarch.rpm \
+              http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/go-toolset-1.20.6-1.module_el8+602+8bb8a8d6.x86_64.rpm
+
+    - name: RPM build MetricCollector
+      id: rpmbuild
+      run: |
+          git config --global --add safe.directory /__w/cc-metric-collector/cc-metric-collector
+          make RPM
+
+    # AlmaLinux 8 is a derivate of RedHat Enterprise Linux 8 (UBI8),
+    # so the created RPM both contain the substring 'el8' in the RPM file names
+    # This step replaces the substring 'el8' to 'alma8'. It uses the move operation
+    # because it is unclear whether the default AlmaLinux 8 container contains the
+    # 'rename' command. This way we also get the new names for output.
+    - name: Rename RPMs (s/el8/alma8/)
+      id: rpmrename
+      run: |
+        OLD_RPM="${{steps.rpmbuild.outputs.RPM}}"
+        OLD_SRPM="${{steps.rpmbuild.outputs.SRPM}}"
+        NEW_RPM="${OLD_RPM/el8/alma8}"
+        NEW_SRPM=${OLD_SRPM/el8/alma8}
+        mv "${OLD_RPM}" "${NEW_RPM}"
+        mv "${OLD_SRPM}" "${NEW_SRPM}"
+        echo "::set-output name=SRPM::${NEW_SRPM}"
+        echo "::set-output name=RPM::${NEW_RPM}"
+
+    # See: https://github.com/actions/upload-artifact
+    - name: Save RPM as artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: cc-metric-collector RPM for AlmaLinux 8
+        path: ${{ steps.rpmrename.outputs.RPM }}
+    - name: Save SRPM as artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: cc-metric-collector SRPM for AlmaLinux 8
+        path: ${{ steps.rpmrename.outputs.SRPM }}
+
+  #
+  # Build on UBI 8 using go-toolset
+  #
+  UBI-8-RPM-build:
+    runs-on: ubuntu-latest
+    # See: https://catalog.redhat.com/software/containers/ubi8/ubi/5c35984d70cc534b3a3784e?container-tabs=gti
+    container: registry.access.redhat.com/ubi8/ubi:8.8-1032.1692772289
+    # The job outputs link to the outputs of the 'rpmbuild' step
+    outputs:
+      rpm : ${{steps.rpmbuild.outputs.RPM}}
+      srpm : ${{steps.rpmbuild.outputs.SRPM}}
+    steps:
+
+    # Use dnf to install development packages
+    - name: Install development packages
+      run: dnf --assumeyes --disableplugin=subscription-manager install rpm-build go-srpm-macros rpm-build-libs rpm-libs gcc make python38 git wget openssl-devel diffutils delve which
+
+    # Checkout git repository and submodules
+    # fetch-depth must be 0 to use git describe
+    # See: https://github.com/marketplace/actions/checkout
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive
+        fetch-depth: 0
+
+    # Use dnf to install build dependencies
+    - name: Install build dependencies
+      run: |
+          dnf --assumeyes --disableplugin=subscription-manager install \
+              http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/golang-1.20.6-2.module_el8+658+f14b2092.x86_64.rpm \
+              http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/golang-bin-1.20.6-2.module_el8+658+f14b2092.x86_64.rpm \
+              http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/golang-src-1.20.6-2.module_el8+658+f14b2092.noarch.rpm \
+              http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/go-toolset-1.20.6-1.module_el8+602+8bb8a8d6.x86_64.rpm
+
+    - name: RPM build MetricCollector
+      id: rpmbuild
+      run: |
+          git config --global --add safe.directory /__w/cc-metric-collector/cc-metric-collector
+          make RPM
+
+    # See: https://github.com/actions/upload-artifact
+    - name: Save RPM as artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: cc-metric-collector RPM for UBI 8
+        path: ${{ steps.rpmbuild.outputs.RPM }}
+    - name: Save SRPM as artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: cc-metric-collector SRPM for UBI 8
+        path: ${{ steps.rpmbuild.outputs.SRPM }}
+
+  #
+  # Build on Ubuntu 22.04 using official go package
+  #
+  Ubuntu-jammy-build:
+    runs-on: ubuntu-latest
+    container: ubuntu:22.04
+    # The job outputs link to the outputs of the 'debrename' step
+    # Only job outputs can be used in child jobs
+    outputs:
+      deb : ${{steps.debrename.outputs.DEB}}
+    steps:
+    # Use apt to install development packages
+    - name: Install development packages
+      run: |
+          apt update && apt --assume-yes upgrade
+          apt --assume-yes install build-essential sed git wget bash
+    # Checkout git repository and submodules
+    # fetch-depth must be 0 to use git describe
+    # See: https://github.com/marketplace/actions/checkout
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive
+        fetch-depth: 0
+    # Use official golang package
+    - name: Install Golang
+      run: |
+          wget -q https://go.dev/dl/go1.21.1.linux-amd64.tar.gz --output-document=- | \
+          tar --directory=/usr/local --extract --gzip
+          export PATH=/usr/local/go/bin:/usr/local/go/pkg/tool/linux_amd64:$PATH
+          go version
+    - name: DEB build MetricCollector
+      id: dpkg-build
+      run: |
+          export PATH=/usr/local/go/bin:/usr/local/go/pkg/tool/linux_amd64:$PATH
+          git config --global --add safe.directory /__w/cc-metric-collector/cc-metric-collector
+          make DEB
+    - name: Rename DEB (add '_ubuntu22.04')
+      id: debrename
+      run: |
+        OLD_DEB_NAME=$(echo "${{steps.dpkg-build.outputs.DEB}}" | rev | cut -d '.' -f 2- | rev)
+        NEW_DEB_FILE="${OLD_DEB_NAME}_ubuntu22.04.deb"
+        mv "${{steps.dpkg-build.outputs.DEB}}" "${NEW_DEB_FILE}"
+        echo "::set-output name=DEB::${NEW_DEB_FILE}"
+    # See: https://github.com/actions/upload-artifact
+    - name: Save DEB as artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: cc-metric-collector DEB for Ubuntu 22.04
+        path: ${{ steps.debrename.outputs.DEB }}
+
+  #
+  # Create release with fresh RPMs
+  #
+  Release:
+    runs-on: ubuntu-latest
+    # We need the RPMs, so add dependency
+    needs: [AlmaLinux-RPM-build, UBI-8-RPM-build, Ubuntu-jammy-build]
+
+    steps:
+    # See: https://github.com/actions/download-artifact
+    - name: Download AlmaLinux 8 RPM
+      uses: actions/download-artifact@v2
+      with:
+        name: cc-metric-collector RPM for AlmaLinux 8
+    - name: Download AlmaLinux 8 SRPM
+      uses: actions/download-artifact@v2
+      with:
+        name: cc-metric-collector SRPM for AlmaLinux 8
+
+    - name: Download UBI 8 RPM
+      uses: actions/download-artifact@v2
+      with:
+        name: cc-metric-collector RPM for UBI 8
+    - name: Download UBI 8 SRPM
+      uses: actions/download-artifact@v2
+      with:
+        name: cc-metric-collector SRPM for UBI 8
+
+    - name: Download Ubuntu 22.04 DEB
+      uses: actions/download-artifact@v2
+      with:
+        name: cc-metric-collector DEB for Ubuntu 22.04
+
+    # The download actions do not publish the name of the downloaded file,
+    # so we re-use the job outputs of the parent jobs. The files are all
+    # downloaded to the current folder.
+    # The gh-release action afterwards does not accept file lists but all
+    # files have to be listed at 'files'. The step creates one output per
+    # RPM package (2 per distro)
+    - name: Set RPM variables
+      id: files
+      run: |
+        ALMA_8_RPM=$(basename "${{ needs.AlmaLinux-RPM-build.outputs.rpm}}")
+        ALMA_8_SRPM=$(basename "${{ needs.AlmaLinux-RPM-build.outputs.srpm}}")
+        UBI_8_RPM=$(basename "${{ needs.UBI-8-RPM-build.outputs.rpm}}")
+        UBI_8_SRPM=$(basename "${{ needs.UBI-8-RPM-build.outputs.srpm}}")
+        U_2004_DEB=$(basename "${{ needs.Ubuntu-focal-build.outputs.deb}}")
+        echo "ALMA_8_RPM::${ALMA_8_RPM}"
+        echo "ALMA_8_SRPM::${ALMA_8_SRPM}"
+        echo "UBI_8_RPM::${UBI_8_RPM}"
+        echo "UBI_8_SRPM::${UBI_8_SRPM}"
+        echo "U_2004_DEB::${U_2004_DEB}"
+        echo "::set-output name=ALMA_8_RPM::${ALMA_8_RPM}"
+        echo "::set-output name=ALMA_8_SRPM::${ALMA_8_SRPM}"
+        echo "::set-output name=UBI_8_RPM::${UBI_8_RPM}"
+        echo "::set-output name=UBI_8_SRPM::${UBI_8_SRPM}"
+        echo "::set-output name=U_2004_DEB::${U_2004_DEB}"
+
+    # See: https://github.com/softprops/action-gh-release
+    - name: Release
+      uses: softprops/action-gh-release@v1
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        name: cc-metric-collector-${{github.ref_name}}
+        files: |
+         ${{ steps.files.outputs.ALMA_8_RPM }}
+         ${{ steps.files.outputs.ALMA_8_SRPM }}
+         ${{ steps.files.outputs.UBI_8_RPM }}
+         ${{ steps.files.outputs.UBI_8_SRPM }}
+         ${{ steps.files.outputs.U_2004_DEB }}
--- a/.github/workflows/rpmbuild.yml
+++ b/.github/workflows/rpmbuild.yml
@@ -1,61 +0,0 @@
-name: Run RPM Build
-on: push
-
-jobs:
-  build-centos8:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: TomTheBear/rpmbuild@master
-      id: rpm
-      name: Build RPM package on CentOS8
-      with:
-        spec_file: "./scripts/cc-metric-collector.spec"
-    - name: Save RPM as artifact
-      uses: actions/upload-artifact@v1.0.0
-      with:
-        name: cc-metric-collector RPM CentOS8
-        path: ${{ steps.rpm.outputs.rpm_dir_path }}
-    - name: Save SRPM as artifact
-      uses: actions/upload-artifact@v1.0.0
-      with:
-        name: cc-metric-collector SRPM CentOS8
-        path: ${{ steps.rpm.outputs.source_rpm_path }}
-  build-centos-latest:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: TomTheBear/rpmbuild@centos_latest
-      id: rpm
-      name: Build RPM package on CentOS 'Latest'
-      with:
-        spec_file: "./scripts/cc-metric-collector.spec"
-    - name: Save RPM as artifact
-      uses: actions/upload-artifact@v1.0.0
-      with:
-        name: cc-metric-collector RPM CentOS 'Latest'
-        path: ${{ steps.rpm.outputs.rpm_dir_path }}
-    - name: Save SRPM as artifact
-      uses: actions/upload-artifact@v1.0.0
-      with:
-        name: cc-metric-collector SRPM CentOS 'Latest'
-        path: ${{ steps.rpm.outputs.source_rpm_path }}
-  build-alma-8_5:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: TomTheBear/rpmbuild@alma8.5
-      id: rpm
-      name: Build RPM package on AlmaLinux 8.5
-      with:
-        spec_file: "./scripts/cc-metric-collector.spec"
-    - name: Save RPM as artifact
-      uses: actions/upload-artifact@v1.0.0
-      with:
-        name: cc-metric-collector RPM AlmaLinux 8.5
-        path: ${{ steps.rpm.outputs.rpm_dir_path }}
-    - name: Save SRPM as artifact
-      uses: actions/upload-artifact@v1.0.0
-      with:
-        name: cc-metric-collector SRPM AlmaLinux 8.5
-        path: ${{ steps.rpm.outputs.source_rpm_path }}
--- a/.github/workflows/runonce.yml
+++ b/.github/workflows/runonce.yml
@@ -1,20 +1,177 @@
+# See: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions
+
+# Workflow name
 name: Run Test
-on: push
+
+# Run on event push
+on:
+  push:
+  workflow_dispatch:

 jobs:
-  build:
+
+  #
+  # Job build-1-20
+  # Build on latest Ubuntu using golang version 1.20
+  #
+  build-1-20:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v2
+    # See: https://github.com/marketplace/actions/checkout
+    # Checkout git repository and submodules
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive

    # See: https://github.com/marketplace/actions/setup-go-environment
    - name: Setup Golang
-      uses: actions/setup-go@v2.1.5
+      uses: actions/setup-go@v4
      with:
-        go-version: '^1.17.6'
+        go-version: '1.20'

    - name: Build MetricCollector
      run: make

-    - name: Run MetricCollector
+    - name: Run MetricCollector once
      run: ./cc-metric-collector --once --config .github/ci-config.json
+
+  #
+  # Job build-1-21
+  # Build on latest Ubuntu using golang version 1.21
+  #
+  build-1-21:
+    runs-on: ubuntu-latest
+    steps:
+    # See: https://github.com/marketplace/actions/checkout
+    # Checkout git repository and submodules
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive
+
+    # See: https://github.com/marketplace/actions/setup-go-environment
+    - name: Setup Golang
+      uses: actions/setup-go@v4
+      with:
+        go-version: '1.21'
+
+    - name: Build MetricCollector
+      run: make
+
+    - name: Run MetricCollector once
+      run: ./cc-metric-collector --once --config .github/ci-config.json
+
+  #
+  # Build on AlmaLinux 8 using go-toolset
+  #
+  AlmaLinux-RPM-build:
+    runs-on: ubuntu-latest
+    # See: https://hub.docker.com/_/almalinux
+    container: almalinux:8
+    # The job outputs link to the outputs of the 'rpmrename' step
+    # Only job outputs can be used in child jobs
+    steps:
+
+    # Use dnf to install development packages
+    - name: Install development packages
+      run: |
+          dnf --assumeyes group install "Development Tools" "RPM Development Tools"
+          dnf --assumeyes install wget openssl-devel diffutils delve which
+
+    # Checkout git repository and submodules
+    # fetch-depth must be 0 to use git describe
+    # See: https://github.com/marketplace/actions/checkout
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive
+        fetch-depth: 0
+
+    # Use dnf to install build dependencies
+    - name: Install build dependencies
+      run: |
+          dnf --assumeyes install \
+              http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/golang-1.20.6-2.module_el8+658+f14b2092.x86_64.rpm \
+              http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/golang-bin-1.20.6-2.module_el8+658+f14b2092.x86_64.rpm \
+              http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/golang-src-1.20.6-2.module_el8+658+f14b2092.noarch.rpm \
+              http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/go-toolset-1.20.6-1.module_el8+602+8bb8a8d6.x86_64.rpm
+
+    - name: RPM build MetricCollector
+      id: rpmbuild
+      run: |
+          git config --global --add safe.directory /__w/cc-metric-collector/cc-metric-collector
+          make RPM
+
+  #
+  # Build on UBI 8 using go-toolset
+  #
+  UBI-8-RPM-build:
+    runs-on: ubuntu-latest
+    # See: https://catalog.redhat.com/software/containers/ubi8/ubi/5c359854d70cc534b3a3784e?container-tabs=gti
+    container: registry.access.redhat.com/ubi8/ubi:8.8-1032.1692772289
+    # The job outputs link to the outputs of the 'rpmbuild' step
+    steps:
+
+    # Use dnf to install development packages
+    - name: Install development packages
+      run: dnf --assumeyes --disableplugin=subscription-manager install rpm-build go-srpm-macros rpm-build-libs rpm-libs gcc make python38 git wget openssl-devel diffutils delve which
+
+    # Checkout git repository and submodules
+    # fetch-depth must be 0 to use git describe
+    # See: https://github.com/marketplace/actions/checkout
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive
+        fetch-depth: 0
+
+    # Use dnf to install build dependencies
+    - name: Install build dependencies
+      run: |
+          dnf --assumeyes --disableplugin=subscription-manager install \
+              http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/golang-1.20.6-2.module_el8+658+f14b2092.x86_64.rpm \
+              http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/golang-bin-1.20.6-2.module_el8+658+f14b2092.x86_64.rpm \
+              http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/golang-src-1.20.6-2.module_el8+658+f14b2092.noarch.rpm \
+              http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/go-toolset-1.20.6-1.module_el8+602+8bb8a8d6.x86_64.rpm
+
+    - name: RPM build MetricCollector
+      id: rpmbuild
+      run: |
+          git config --global --add safe.directory /__w/cc-metric-collector/cc-metric-collector
+          make RPM
+
+  #
+  # Build on Ubuntu 22.04 using official go package
+  #
+  Ubuntu-jammy-build:
+    runs-on: ubuntu-latest
+    container: ubuntu:22.04
+
+    steps:
+    # Use apt to install development packages
+    - name: Install development packages
+      run: |
+          apt update && apt --assume-yes upgrade
+          apt --assume-yes install build-essential sed git wget bash
+    # Checkout git repository and submodules
+    # fetch-depth must be 0 to use git describe
+    # See: https://github.com/marketplace/actions/checkout
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive
+        fetch-depth: 0
+    # Use official golang package
+    - name: Install Golang
+      run: |
+          wget -q https://go.dev/dl/go1.21.1.linux-amd64.tar.gz --output-document=- | \
+          tar --directory=/usr/local --extract --gzip
+          export PATH=/usr/local/go/bin:/usr/local/go/pkg/tool/linux_amd64:$PATH
+          go version
+    - name: DEB build MetricCollector
+      id: dpkg-build
+      run: |
+          export PATH=/usr/local/go/bin:/usr/local/go/pkg/tool/linux_amd64:$PATH
+          git config --global --add safe.directory /__w/cc-metric-collector/cc-metric-collector
+          make DEB
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule ".github/actions/rpmbuild-centos8-golang"]
+	path = .github/actions/rpmbuild-centos8-golang
+	url = https://github.com/naveenrajm7/rpmbuild.git
+	branch = centos8
--- a/.zenodo.json
+++ b/.zenodo.json
@@ -0,0 +1,29 @@
+{
+  "title": "cc-metric-collector",
+  "description": "Monitoring agent for ClusterCockpit.",
+  "creators": [
+    {
+      "affiliation": "Regionales Rechenzentrum Erlangen, Friedrich-Alexander-Universität Erlangen-Nürnberg",
+      "name": "Thomas Gruber",
+      "orcid": "0000-0001-5560-6964"
+    },
+    {
+      "affiliation": "Steinbuch Centre for Computing, Karlsruher Institut für Technologie",
+      "name": "Holger Obermaier",
+      "orcid": "0000-0002-6830-6626"
+    }
+  ],
+  "upload_type": "software",
+  "license": "MIT",
+  "access_right": "open",
+  "keywords": [
+    "performance-monitoring",
+    "cluster-monitoring",
+    "open-source"
+  ],
+  "communities": [
+    {
+      "identifier": "clustercockpit"
+    }
+  ]
+}
--- a/112
+++ b/112
@@ -1,43 +1,129 @@
 APP = cc-metric-collector
-GOSRC_APP        := metric-collector.go
+GOSRC_APP        := cc-metric-collector.go
 GOSRC_COLLECTORS := $(wildcard collectors/*.go)
 GOSRC_SINKS      := $(wildcard sinks/*.go)
 GOSRC_RECEIVERS  := $(wildcard receivers/*.go)
 GOSRC_INTERNAL   := $(wildcard internal/*/*.go)
 GOSRC            := $(GOSRC_APP) $(GOSRC_COLLECTORS) $(GOSRC_SINKS) $(GOSRC_RECEIVERS) $(GOSRC_INTERNAL)
+COMPONENT_DIRS   := collectors \
+			sinks \
+			receivers \
+			internal/metricRouter \
+			internal/ccMetric \
+			internal/metricAggregator \
+			internal/ccLogger \
+			internal/ccTopology \
+			internal/multiChanTicker
+
+BINDIR = bin
+GOBIN = $(shell which go)


 .PHONY: all
 all: $(APP)

-$(APP): $(GOSRC)
+$(APP): $(GOSRC) go.mod
 	make -C collectors
-	go get
-	go build -o $(APP) $(GOSRC_APP)
+	$(GOBIN) get
+	$(GOBIN) build -o $(APP) $(GOSRC_APP)
+
+install: $(APP)
+	@WORKSPACE=$(PREFIX)
+	@if [ -z "$${WORKSPACE}" ]; then exit 1; fi
+	@mkdir --parents --verbose $${WORKSPACE}/usr/$(BINDIR)
+	@install -Dpm 755 $(APP) $${WORKSPACE}/usr/$(BINDIR)/$(APP)
+	@mkdir --parents --verbose $${WORKSPACE}/etc/cc-metric-collector $${WORKSPACE}/etc/default $${WORKSPACE}/etc/systemd/system $${WORKSPACE}/etc/init.d
+	@install -Dpm 600 config.json $${WORKSPACE}/etc/cc-metric-collector/cc-metric-collector.json
+	@sed -i -e s+"\"./"+"\"/etc/cc-metric-collector/"+g $${WORKSPACE}/etc/cc-metric-collector/cc-metric-collector.json
+	@install -Dpm 600 sinks.json $${WORKSPACE}/etc/cc-metric-collector/sinks.json
+	@install -Dpm 600 collectors.json $${WORKSPACE}/etc/cc-metric-collector/collectors.json
+	@install -Dpm 600 router.json $${WORKSPACE}/etc/cc-metric-collector/router.json
+	@install -Dpm 600 receivers.json $${WORKSPACE}/etc/cc-metric-collector/receivers.json
+	@install -Dpm 600 scripts/cc-metric-collector.config $${WORKSPACE}/etc/default/cc-metric-collector
+	@install -Dpm 644 scripts/cc-metric-collector.service $${WORKSPACE}/etc/systemd/system/cc-metric-collector.service
+	@install -Dpm 644 scripts/cc-metric-collector.init $${WORKSPACE}/etc/init.d/cc-metric-collector
+

 .PHONY: clean
+.ONESHELL:
 clean:
-	make -C collectors clean
+	@for COMP in $(COMPONENT_DIRS); do if [ -e $$COMP/Makefile ]; then make -C $$COMP clean;  fi; done
 	rm -f $(APP)

 .PHONY: fmt
 fmt:
-	go fmt $(GOSRC_COLLECTORS)
-	go fmt $(GOSRC_SINKS)
-	go fmt $(GOSRC_RECEIVERS)
-	go fmt $(GOSRC_APP)
-	@for F in $(GOSRC_INTERNAL); do go fmt $$F; done
+	$(GOBIN) fmt $(GOSRC_COLLECTORS)
+	$(GOBIN) fmt $(GOSRC_SINKS)
+	$(GOBIN) fmt $(GOSRC_RECEIVERS)
+	$(GOBIN) fmt $(GOSRC_APP)
+	@for F in $(GOSRC_INTERNAL); do $(GOBIN) fmt $$F; done


 # Examine Go source code and reports suspicious constructs
 .PHONY: vet
 vet:
-	go vet ./...
+	$(GOBIN) vet ./...


 # Run linter for the Go programming language.
 # Using static analysis, it finds bugs and performance issues, offers simplifications, and enforces style rules
 .PHONY: staticcheck
 staticcheck:
-	go install honnef.co/go/tools/cmd/staticcheck@latest
-	$$(go env GOPATH)/bin/staticcheck ./...
+	$(GOBIN) install honnef.co/go/tools/cmd/staticcheck@latest
+	$$($(GOBIN) env GOPATH)/bin/staticcheck ./...
+
+.ONESHELL:
+.PHONY: RPM
+RPM: scripts/cc-metric-collector.spec
+	@WORKSPACE="$${PWD}"
+	@SPECFILE="$${WORKSPACE}/scripts/cc-metric-collector.spec"
+	# Setup RPM build tree
+	@eval $$(rpm --eval "ARCH='%{_arch}' RPMDIR='%{_rpmdir}' SOURCEDIR='%{_sourcedir}' SPECDIR='%{_specdir}' SRPMDIR='%{_srcrpmdir}' BUILDDIR='%{_builddir}'")
+	@mkdir --parents --verbose "$${RPMDIR}" "$${SOURCEDIR}" "$${SPECDIR}" "$${SRPMDIR}" "$${BUILDDIR}"
+	# Create source tarball
+	@COMMITISH="HEAD"
+	@VERS=$$(git describe --tags $${COMMITISH})
+	@VERS=$${VERS#v}
+	@VERS=$$(echo $${VERS} | sed -e s+'-'+'_'+g)
+	@eval $$(rpmspec --query --queryformat "NAME='%{name}' VERSION='%{version}' RELEASE='%{release}' NVR='%{NVR}' NVRA='%{NVRA}'" --define="VERS $${VERS}" "$${SPECFILE}")
+	@PREFIX="$${NAME}-$${VERSION}"
+	@FORMAT="tar.gz"
+	@SRCFILE="$${SOURCEDIR}/$${PREFIX}.$${FORMAT}"
+	@git archive --verbose --format "$${FORMAT}" --prefix="$${PREFIX}/" --output="$${SRCFILE}" $${COMMITISH}
+	# Build RPM and SRPM
+	@rpmbuild -ba --define="VERS $${VERS}" --rmsource --clean "$${SPECFILE}"
+	# Report RPMs and SRPMs when in GitHub Workflow
+	@if [[ "$${GITHUB_ACTIONS}" == true ]]; then
+	@     RPMFILE="$${RPMDIR}/$${ARCH}/$${NVRA}.rpm"
+	@     SRPMFILE="$${SRPMDIR}/$${NVR}.src.rpm"
+	@     echo "SRPM=$${SRPMFILE}" >> $${GITHUB_OUTPUT}
+	@     echo "RPM=$${RPMFILE}" >> $${GITHUB_OUTPUT}
+	@fi
+
+.PHONY: DEB
+DEB: scripts/cc-metric-collector.deb.control $(APP)
+	@BASEDIR=$${PWD}
+	@WORKSPACE=$${PWD}/.dpkgbuild
+	@DEBIANDIR=$${WORKSPACE}/debian
+	@DEBIANBINDIR=$${WORKSPACE}/DEBIAN
+	@mkdir --parents --verbose $${WORKSPACE} $${DEBIANBINDIR}
+	#@mkdir --parents --verbose $$DEBIANDIR
+	@CONTROLFILE="$${BASEDIR}/scripts/cc-metric-collector.deb.control"
+	@COMMITISH="HEAD"
+	@VERS=$$(git describe --tags --abbrev=0 $${COMMITISH})
+	@if [ -z "$${VERS}" ]; then VERS=${GITHUB_REF_NAME}; fi
+	@VERS=$${VERS#v}
+	@ARCH=$$(uname -m)
+	@ARCH=$$(echo $${ARCH} | sed -e s+'_'+'-'+g)
+	@if [ "$${ARCH}" = "x86-64" ]; then ARCH=amd64; fi
+	@PREFIX="$${NAME}-$${VERSION}_$${ARCH}"
+	@SIZE_BYTES=$$(du -bcs --exclude=.dpkgbuild "$${WORKSPACE}"/ | awk '{print $$1}' | head -1 | sed -e 's/^0\+//')
+	@SIZE="$$(awk -v size="$${SIZE_BYTES}" 'BEGIN {print (size/1024)+1}' | awk '{print int($$0)}')"
+	@sed -e s+"{VERSION}"+"$${VERS}"+g -e s+"{INSTALLED_SIZE}"+"$${SIZE}"+g -e s+"{ARCH}"+"$${ARCH}"+g $${CONTROLFILE} > $${DEBIANBINDIR}/control
+	@make PREFIX=$${WORKSPACE} install
+	@DEB_FILE="cc-metric-collector_$${VERS}_$${ARCH}.deb"
+	@dpkg-deb -b $${WORKSPACE} "$${DEB_FILE}"
+	@if [ "$${GITHUB_ACTIONS}" = "true" ]; then
+	@     echo "DEB=$${DEB_FILE}" >> $${GITHUB_OUTPUT}
+	@fi
+	@rm -r "$${WORKSPACE}"
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # cc-metric-collector
-A node agent for measuring, processing and forwarding node level metrics. It is part of the ClusterCockpit ecosystem.
+
+A node agent for measuring, processing and forwarding node level metrics. It is part of the [ClusterCockpit ecosystem](./docs/introduction.md).

 The metric collector sends (and receives) metric in the [InfluxDB line protocol](https://docs.influxdata.com/influxdb/cloud/reference/syntax/line-protocol/) as it provides flexibility while providing a separation between tags (like index columns in relational databases) and fields (like data columns).

@@ -7,10 +8,14 @@ There is a single timer loop that triggers all collectors serially, collects the

 The receiver runs as a go routine side-by-side with the timer loop and asynchronously forwards received metrics to the sink.

+
+[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.7438287.svg)](https://doi.org/10.5281/zenodo.7438287)
+
+
 # Configuration

 Configuration is implemented using a single json document that is distributed over network and may be persisted as file.
-Supported metrics are documented [here](https://github.com/ClusterCockpit/cc-specifications/blob/master/metrics/lineprotocol_alternative.md).
+Supported metrics are documented [here](https://github.com/ClusterCockpit/cc-specifications/blob/master/interfaces/lineprotocol/README.md).

 There is a main configuration file with basic settings that point to the other configuration files for the different components.

@@ -20,33 +25,35 @@ There is a main configuration file with basic settings that point to the other c
  "collectors" : "collectors.json",
  "receivers" : "receivers.json",
  "router" : "router.json",
-  "interval": 10,
-  "duration": 1
+  "interval": "10s",
+  "duration": "1s"
 }
 ```

-The `interval` defines how often the metrics should be read and send to the sink. The `duration` tells collectors how long one measurement has to take. This is important for some collectors, like the `likwid` collector.
+The `interval` defines how often the metrics should be read and send to the sink. The `duration` tells collectors how long one measurement has to take. This is important for some collectors, like the `likwid` collector. For more information, see [here](./docs/configuration.md).

 See the component READMEs for their configuration:
+
 * [`collectors`](./collectors/README.md)
 * [`sinks`](./sinks/README.md)
 * [`receivers`](./receivers/README.md)
 * [`router`](./internal/metricRouter/README.md)

-
 # Installation

 ```
 $ git clone git@github.com:ClusterCockpit/cc-metric-collector.git
 $ make (downloads LIKWID, builds it as static library with 'direct' accessmode and copies all required files for the collector)
-$ go get (requires at least golang 1.13)
-$ go build metric-collector
+$ go get (requires at least golang 1.16)
+$ make
 ```

+For more information, see [here](./docs/building.md).
+
 # Running

 ```
-$ ./metric-collector --help
+$ ./cc-metric-collector --help
 Usage of metric-collector:
  -config string
    	Path to configuration file (default "./config.json")
@@ -54,17 +61,51 @@ Usage of metric-collector:
    	Path for logfile (default "stderr")
  -once
    	Run all collectors only once
-  -pidfile string
-    	Path for PID file (default "/var/run/cc-metric-collector.pid")
 ```

+# Scenarios
+
+The metric collector was designed with flexibility in mind, so it can be used in many scenarios. Here are a few:
+
+```mermaid
+flowchart TD
+  subgraph a ["Cluster A"]
+  nodeA[NodeA with CC collector]
+  nodeB[NodeB with CC collector]
+  nodeC[NodeC with CC collector]
+  end
+  a --> db[(Database)]
+  db <--> ccweb("Webfrontend")
+```
+
+``` mermaid
+flowchart TD
+  subgraph a [ClusterA]
+  direction LR
+  nodeA[NodeA with CC collector]
+  nodeB[NodeB with CC collector]
+  nodeC[NodeC with CC collector]
+  end
+  subgraph b [ClusterB]
+  direction LR
+  nodeD[NodeD with CC collector]
+  nodeE[NodeE with CC collector]
+  nodeF[NodeF with CC collector]
+  end
+  a --> ccrecv{"CC collector as receiver"}
+  b --> ccrecv
+  ccrecv --> db[("Database1")]
+  ccrecv -.-> db2[("Database2")]
+  db <-.-> ccweb("Webfrontend")
+```

 # Contributing
+
 The ClusterCockpit ecosystem is designed to be used by different HPC computing centers. Since configurations and setups differ between the centers, the centers likely have to put some work into the cc-metric-collector to gather all desired metrics.

 You are free to open an issue to request a collector but we would also be happy about PRs.

-# Contact 
+# Contact

 * [Matrix.org ClusterCockpit General chat](https://matrix.to/#/#clustercockpit-dev:matrix.org)
 * [Matrix.org ClusterCockpit Development chat](https://matrix.to/#/#clustercockpit:matrix.org)
--- a/cc-metric-collector.go
+++ b/cc-metric-collector.go
@@ -15,16 +15,15 @@ import (
 	"sync"
 	"time"

-	cclog "github.com/ClusterCockpit/cc-metric-collector/internal/ccLogger"
-	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
 	mr "github.com/ClusterCockpit/cc-metric-collector/internal/metricRouter"
-	mct "github.com/ClusterCockpit/cc-metric-collector/internal/multiChanTicker"
+	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
+	mct "github.com/ClusterCockpit/cc-metric-collector/pkg/multiChanTicker"
 )

 type CentralConfigFile struct {
-	Interval            int    `json:"interval"`
-	Duration            int    `json:"duration"`
-	Pidfile             string `json:"pidfile,omitempty"`
+	Interval            string `json:"interval"`
+	Duration            string `json:"duration"`
 	CollectorConfigFile string `json:"collectors"`
 	RouterConfigFile    string `json:"router"`
 	SinkConfigFile      string `json:"sinks"`
@@ -87,14 +86,12 @@ func ReadCli() map[string]string {
 	var m map[string]string
 	cfg := flag.String("config", "./config.json", "Path to configuration file")
 	logfile := flag.String("log", "stderr", "Path for logfile")
-	pidfile := flag.String("pidfile", "/var/run/cc-metric-collector.pid", "Path for PID file")
 	once := flag.Bool("once", false, "Run all collectors only once")
 	debug := flag.Bool("debug", false, "Activate debug output")
 	flag.Parse()
 	m = make(map[string]string)
 	m["configfile"] = *cfg
 	m["logfile"] = *logfile
-	m["pidfile"] = *pidfile
 	if *once {
 		m["once"] = "true"
 	} else {
@@ -125,25 +122,6 @@ func ReadCli() map[string]string {
 //	return nil
 //}

-//func CreatePidfile(pidfile string) error {
-//	file, err := os.OpenFile(pidfile, os.O_CREATE|os.O_RDWR, 0600)
-//	if err != nil {
-//		log.Print(err)
-//		return err
-//	}
-//	file.Write([]byte(fmt.Sprintf("%d", os.Getpid())))
-//	file.Close()
-//	return nil
-//}
-
-//func RemovePidfile(pidfile string) error {
-//	info, err := os.Stat(pidfile)
-//	if !os.IsNotExist(err) && !info.IsDir() {
-//		os.Remove(pidfile)
-//	}
-//	return nil
-//}
-
 // General shutdownHandler function that gets executed in case of interrupt or graceful shutdownHandler
 func shutdownHandler(config *RuntimeConfig, shutdownSignal chan os.Signal) {
 	defer config.Sync.Done()
@@ -174,11 +152,6 @@ func shutdownHandler(config *RuntimeConfig, shutdownSignal chan os.Signal) {
 		cclog.Debug("Shutdown SinkManager...")
 		config.SinkManager.Close()
 	}
-
-	//	pidfile := config.ConfigFile.Pidfile
-	//	RemovePidfile(pidfile)
-	//	pidfile = config.CliArgs["pidfile"]
-	//	RemovePidfile(pidfile)
 }

 func mainFunc() int {
@@ -200,16 +173,36 @@ func mainFunc() int {
 		cclog.Error("Error reading configuration file ", rcfg.CliArgs["configfile"], ": ", err.Error())
 		return 1
 	}
-	if rcfg.ConfigFile.Interval <= 0 || time.Duration(rcfg.ConfigFile.Interval)*time.Second <= 0 {
-		cclog.Error("Configuration value 'interval' must be greater than zero")
+
+	// Properly use duration parser with inputs like '60s', '5m' or similar
+	if len(rcfg.ConfigFile.Interval) > 0 {
+		t, err := time.ParseDuration(rcfg.ConfigFile.Interval)
+		if err != nil {
+			cclog.Error("Configuration value 'interval' no valid duration")
+		}
+		rcfg.Interval = t
+		if rcfg.Interval == 0 {
+			cclog.Error("Configuration value 'interval' must be greater than zero")
+			return 1
+		}
+	}
+
+	// Properly use duration parser with inputs like '60s', '5m' or similar
+	if len(rcfg.ConfigFile.Duration) > 0 {
+		t, err := time.ParseDuration(rcfg.ConfigFile.Duration)
+		if err != nil {
+			cclog.Error("Configuration value 'duration' no valid duration")
+		}
+		rcfg.Duration = t
+		if rcfg.Duration == 0 {
+			cclog.Error("Configuration value 'duration' must be greater than zero")
+			return 1
+		}
+	}
+	if rcfg.Duration > rcfg.Interval {
+		cclog.Error("The interval should be greater than duration")
 		return 1
 	}
-	rcfg.Interval = time.Duration(rcfg.ConfigFile.Interval) * time.Second
-	if rcfg.ConfigFile.Duration <= 0 || time.Duration(rcfg.ConfigFile.Duration)*time.Second <= 0 {
-		cclog.Error("Configuration value 'duration' must be greater than zero")
-		return 1
-	}
-	rcfg.Duration = time.Duration(rcfg.ConfigFile.Duration) * time.Second

 	if len(rcfg.ConfigFile.RouterConfigFile) == 0 {
 		cclog.Error("Metric router configuration file must be set")
@@ -226,8 +219,6 @@ func mainFunc() int {
 		return 1
 	}

-	//	err = CreatePidfile(rcfg.CliArgs["pidfile"])
-
 	// Set log file
 	if logfile := rcfg.CliArgs["logfile"]; logfile != "stderr" {
 		cclog.SetOutput(logfile)
@@ -300,7 +291,7 @@ func mainFunc() int {

 	// Wait until one tick has passed. This is a workaround
 	if rcfg.CliArgs["once"] == "true" {
-		x := 1.2 * float64(rcfg.ConfigFile.Interval)
+		x := 1.2 * float64(rcfg.Interval.Seconds())
 		time.Sleep(time.Duration(int(x)) * time.Second)
 		shutdownSignal <- os.Interrupt
 	}
--- a/collectors.json
+++ b/collectors.json
@@ -1,15 +1,41 @@
 {
+    "cpufreq": {},
+    "cpufreq_cpuinfo": {},
+    "gpfs": {
+        "exclude_filesystem": [
+            "test_fs"
+        ]
+    },
+    "ibstat": {},
+    "loadavg": {
+        "exclude_metrics": [
+            "proc_total"
+        ]
+    },
+    "memstat": {},
+    "netstat": {
+        "include_devices": [
+            "enp5s0"
+        ],
+        "send_derived_values": true
+    },
+    "numastats": {},
+    "nvidia": {},
    "tempstat": {
-      "tag_override": {
-        "hwmon0" : {
-            "type" : "socket",
-            "type-id" : "0"
-        },
-        "hwmon1" : {
-            "type" : "socket",
-            "type-id" : "1"
+        "report_max_temperature": true,
+        "report_critical_temperature": true,
+        "tag_override": {
+            "hwmon0": {
+                "type": "socket",
+                "type-id": "0"
+            },
+            "hwmon1": {
+                "type": "socket",
+                "type-id": "1"
+            }
        }
-      }
+    },
+    "topprocs": {
+        "num_procs": 5
    }
-    
-}
+}
--- a/collectors/Makefile
+++ b/collectors/Makefile
@@ -1,82 +1,33 @@
-# Use central installation
-CENTRAL_INSTALL = false
-# How to access hardware performance counters through LIKWID.
-# Recommended is 'direct' mode
-ACCESSMODE = direct
+# LIKWID version
+LIKWID_VERSION := 5.2.2
+LIKWID_INSTALLED_FOLDER := $(shell dirname $$(which likwid-topology 2>/dev/null) 2>/dev/null)

-#######################################################################
-# if CENTRAL_INSTALL == true
-#######################################################################
-# Path to central installation (if CENTRAL_INSTALL=true)
-LIKWID_BASE=/apps/likwid/5.2.1
-# LIKWID version (should be same major version as central installation, 5.2.x)
-LIKWID_VERSION = 5.2.1
+LIKWID_FOLDER := $(CURDIR)/likwid

-#######################################################################
-# if CENTRAL_INSTALL == false and ACCESSMODE == accessdaemon
-#######################################################################
-# Where to install the accessdaemon
-DAEMON_INSTALLDIR = /usr/local
-# Which user to use for the accessdaemon
-DAEMON_USER = root
-# Which group to use for the accessdaemon
-DAEMON_GROUP = root
+all: likwid

+.ONESHELL:
+.PHONY: likwid
+likwid:
+	if [ -n "$(LIKWID_INSTALLED_FOLDER)" ]; then
+	    # Using likwid include files from system installation
+	    INCLUDE_DIR="$(LIKWID_INSTALLED_FOLDER)/../include"
+	    mkdir --parents --verbose "$(LIKWID_FOLDER)"
+	    cp "$${INCLUDE_DIR}"/*.h "$(LIKWID_FOLDER)"
+	else
+	    # Using likwid include files from downloaded tar archive
+	    if [ -d "$(LIKWID_FOLDER)" ]; then
+	        rm --recursive "$(LIKWID_FOLDER)"
+	    fi
+	    BUILD_FOLDER="$${PWD}/likwidbuild"
+	    mkdir --parents --verbose  "$${BUILD_FOLDER}"
+	    wget --output-document=- http://ftp.rrze.uni-erlangen.de/mirrors/likwid/likwid-$(LIKWID_VERSION).tar.gz |
+	        tar --directory="$${BUILD_FOLDER}" --extract --gz
+		install -D --verbose --preserve-timestamps --mode=0644 --target-directory="$(LIKWID_FOLDER)" "$${BUILD_FOLDER}/likwid-$(LIKWID_VERSION)/src/includes"/likwid*.h "$${BUILD_FOLDER}/likwid-$(LIKWID_VERSION)/src/includes"/bstrlib.h
+	    rm --recursive "$${BUILD_FOLDER}"
+	fi


-#################################################
-# No need to change anything below this line
-#################################################
-INSTALL_FOLDER = ./likwid
-BUILD_FOLDER = ./likwid/build
-
-ifneq ($(strip $(CENTRAL_INSTALL)),true)
-LIKWID_BASE := $(shell pwd)/$(INSTALL_FOLDER)
-DAEMON_BASE := $(LIKWID_BASE)
-GROUPS_BASE := $(LIKWID_BASE)/groups
-all: $(INSTALL_FOLDER)/liblikwid.a cleanup
-else
-DAEMON_BASE= $(LIKWID_BASE)/sbin
-all: $(INSTALL_FOLDER)/liblikwid.a cleanup
-endif
-
-
-
-$(BUILD_FOLDER)/likwid-$(LIKWID_VERSION).tar.gz: $(BUILD_FOLDER)
-	wget -P $(BUILD_FOLDER) ftp://ftp.rrze.uni-erlangen.de/mirrors/likwid/likwid-$(LIKWID_VERSION).tar.gz
-
-$(BUILD_FOLDER):
-	mkdir -p $(BUILD_FOLDER)
-
-$(INSTALL_FOLDER):
-	mkdir -p $(INSTALL_FOLDER)
-
-$(BUILD_FOLDER)/likwid-$(LIKWID_VERSION): $(BUILD_FOLDER)/likwid-$(LIKWID_VERSION).tar.gz
-	tar -C $(BUILD_FOLDER) -xf $(BUILD_FOLDER)/likwid-$(LIKWID_VERSION).tar.gz
-
-$(INSTALL_FOLDER)/liblikwid.a: $(BUILD_FOLDER)/likwid-$(LIKWID_VERSION) $(INSTALL_FOLDER)
-	sed -i -e s+"PREFIX ?= .*"+"PREFIX = $(LIKWID_BASE)"+g \
-		-e s+"SHARED_LIBRARY = .*"+"SHARED_LIBRARY = false"+g \
-		-e s+"ACCESSMODE = .*"+"ACCESSMODE = $(ACCESSMODE)"+g \
-		-e s+"INSTALLED_ACCESSDAEMON = .*"+"INSTALLED_ACCESSDAEMON = $(DAEMON_INSTALLDIR)/likwid-accessD"+g \
-		$(BUILD_FOLDER)/likwid-$(LIKWID_VERSION)/config.mk
-	cd $(BUILD_FOLDER)/likwid-$(LIKWID_VERSION) && make
-	cp $(BUILD_FOLDER)/likwid-$(LIKWID_VERSION)/liblikwid.a $(INSTALL_FOLDER)
-	cp $(BUILD_FOLDER)/likwid-$(LIKWID_VERSION)/ext/hwloc/liblikwid-hwloc.a $(INSTALL_FOLDER)
-	cp $(BUILD_FOLDER)/likwid-$(LIKWID_VERSION)/src/includes/likwid*.h $(INSTALL_FOLDER)
-	cp $(BUILD_FOLDER)/likwid-$(LIKWID_VERSION)/src/includes/bstrlib.h $(INSTALL_FOLDER)
-
-$(DAEMON_INSTALLDIR)/likwid-accessD: $(BUILD_FOLDER)/likwid-$(LIKWID_VERSION)/likwid-accessD
-	sudo -u $(DAEMON_USER) -g $(DAEMON_GROUP) install -m 4775 $(BUILD_FOLDER)/likwid-$(LIKWID_VERSION)/likwid-accessD $(DAEMON_INSTALLDIR)/likwid-accessD
-
-prepare_collector: likwidMetric.go
-	cp likwidMetric.go likwidMetric.go.orig
-	sed -i -e s+"const GROUPPATH =.*"+"const GROUPPATH = \`$(GROUPS_BASE)\`"+g likwidMetric.go
-
-cleanup:
-	rm -rf $(BUILD_FOLDER)
-
-clean: cleanup
-	rm -rf likwid
-
 .PHONY: clean
+clean:
+	rm -rf likwid
--- a/collectors/README.md
+++ b/collectors/README.md
@@ -18,21 +18,31 @@ In contrast to the configuration files for sinks and receivers, the collectors c

 * [`cpustat`](./cpustatMetric.md)
 * [`memstat`](./memstatMetric.md)
+* [`iostat`](./iostatMetric.md)
 * [`diskstat`](./diskstatMetric.md)
 * [`loadavg`](./loadavgMetric.md)
 * [`netstat`](./netstatMetric.md)
 * [`ibstat`](./infinibandMetric.md)
+* [`ibstat_perfquery`](./infinibandPerfQueryMetric.md)
 * [`tempstat`](./tempMetric.md)
-* [`lustre`](./lustreMetric.md)
+* [`lustrestat`](./lustreMetric.md)
 * [`likwid`](./likwidMetric.md)
 * [`nvidia`](./nvidiaMetric.md)
 * [`customcmd`](./customCmdMetric.md)
 * [`ipmistat`](./ipmiMetric.md)
 * [`topprocs`](./topprocsMetric.md)
+* [`nfs3stat`](./nfs3Metric.md)
+* [`nfs4stat`](./nfs4Metric.md)
+* [`cpufreq`](./cpufreqMetric.md)
+* [`cpufreq_cpuinfo`](./cpufreqCpuinfoMetric.md)
+* [`numastats`](./numastatsMetric.md)
+* [`gpfs`](./gpfsMetric.md)
+* [`beegfs_meta`](./beegfsmetaMetric.md)
+* [`beegfs_storage`](./beegfsstorageMetric.md)
+* [`rocm_smi`](./rocmsmiMetric.md)

 ## Todos

-* [ ] Exclude devices for `diskstat` collector
 * [ ] Aggreate metrics to higher topology entity (sum hwthread metrics to socket metric, ...). Needs to be configurable

 # Contributing own collectors
@@ -41,7 +51,7 @@ A collector reads data from any source, parses it to metrics and submits these m
 * `Name() string`: Return the name of the collector
 * `Init(config json.RawMessage) error`: Initializes the collector using the given collector-specific config in JSON. Check if needed files/commands exists, ...
 * `Initialized() bool`: Check if a collector is successfully initialized
-* `Read(duration time.Duration, output chan ccMetric.CCMetric)`: Read, parse and submit data to the `output` channel as [`CCMetric`](../internal/ccMetric/README.md). If the collector has to measure anything for some duration, use the provided function argument `duration`. 
+* `Read(duration time.Duration, output chan ccMetric.CCMetric)`: Read, parse and submit data to the `output` channel as [`CCMetric`](../internal/ccMetric/README.md). If the collector has to measure anything for some duration, use the provided function argument `duration`.
 * `Close()`: Closes down the collector.

 It is recommanded to call `setup()` in the `Init()` function.
@@ -71,6 +81,11 @@ type SampleCollector struct {
 }

 func (m *SampleCollector) Init(config json.RawMessage) error {
+    // Check if already initialized
+    if m.init {
+        return nil
+    }
+
    m.name = "SampleCollector"
    m.setup()
    if len(config) > 0 {
@@ -91,10 +106,15 @@ func (m *SampleCollector) Read(interval time.Duration, output chan lp.CCMetric)
    }
    // tags for the metric, if type != node use proper type and type-id
    tags := map[string]string{"type" : "node"}
+
+    x, err := GetMetric()
+    if err != nil {
+        cclog.ComponentError(m.name, fmt.Sprintf("Read(): %v", err))
+    }
+
    // Each metric has exactly one field: value !
-    value := map[string]interface{}{"value": int(x)}
-    y, err := lp.New("sample_metric", tags, m.meta, value, time.Now())
-    if err == nil {
+    value := map[string]interface{}{"value": int64(x)}
+    if y, err := lp.New("sample_metric", tags, m.meta, value, time.Now()); err == nil {
        output <- y
    }
 }
--- a/collectors/beegfsmetaMetric.go
+++ b/collectors/beegfsmetaMetric.go
@@ -0,0 +1,230 @@
+package collectors
+
+import (
+	"bufio"
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"io"
+	"os"
+	"os/exec"
+	"os/user"
+	"regexp"
+	"strconv"
+	"strings"
+	"time"
+
+	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
+)
+
+const DEFAULT_BEEGFS_CMD = "beegfs-ctl"
+
+// Struct for the collector-specific JSON config
+type BeegfsMetaCollectorConfig struct {
+	Beegfs            string   `json:"beegfs_path"`
+	ExcludeMetrics    []string `json:"exclude_metrics,omitempty"`
+	ExcludeFilesystem []string `json:"exclude_filesystem"`
+}
+
+type BeegfsMetaCollector struct {
+	metricCollector
+	tags    map[string]string
+	matches map[string]string
+	config  BeegfsMetaCollectorConfig
+	skipFS  map[string]struct{}
+}
+
+func (m *BeegfsMetaCollector) Init(config json.RawMessage) error {
+	// Check if already initialized
+	if m.init {
+		return nil
+	}
+	// Metrics
+	var nodeMdstat_array = [39]string{
+		"sum", "ack", "close", "entInf",
+		"fndOwn", "mkdir", "create", "rddir",
+		"refrEn", "mdsInf", "rmdir", "rmLnk",
+		"mvDirIns", "mvFiIns", "open", "ren",
+		"sChDrct", "sAttr", "sDirPat", "stat",
+		"statfs", "trunc", "symlnk", "unlnk",
+		"lookLI", "statLI", "revalLI", "openLI",
+		"createLI", "hardlnk", "flckAp", "flckEn",
+		"flckRg", "dirparent", "listXA", "getXA",
+		"rmXA", "setXA", "mirror"}
+
+	m.name = "BeegfsMetaCollector"
+	m.setup()
+	m.parallel = true
+	// Set default beegfs-ctl binary
+
+	m.config.Beegfs = DEFAULT_BEEGFS_CMD
+
+	// Read JSON configuration
+	if len(config) > 0 {
+		err := json.Unmarshal(config, &m.config)
+		if err != nil {
+			return err
+		}
+	}
+
+	//create map with possible variables
+	m.matches = make(map[string]string)
+	for _, value := range nodeMdstat_array {
+		_, skip := stringArrayContains(m.config.ExcludeMetrics, value)
+		if skip {
+			m.matches["other"] = "0"
+		} else {
+			m.matches["beegfs_cmeta_"+value] = "0"
+		}
+	}
+
+	m.meta = map[string]string{
+		"source": m.name,
+		"group":  "BeegfsMeta",
+	}
+	m.tags = map[string]string{
+		"type":       "node",
+		"filesystem": "",
+	}
+	m.skipFS = make(map[string]struct{})
+	for _, fs := range m.config.ExcludeFilesystem {
+		m.skipFS[fs] = struct{}{}
+	}
+
+	// Beegfs file system statistics can only be queried by user root
+	user, err := user.Current()
+	if err != nil {
+		return fmt.Errorf("BeegfsMetaCollector.Init(): Failed to get current user: %v", err)
+	}
+	if user.Uid != "0" {
+		return fmt.Errorf("BeegfsMetaCollector.Init(): BeeGFS file system statistics can only be queried by user root")
+	}
+
+	// Check if beegfs-ctl is in executable search path
+	_, err = exec.LookPath(m.config.Beegfs)
+	if err != nil {
+		return fmt.Errorf("BeegfsMetaCollector.Init(): Failed to find beegfs-ctl binary '%s': %v", m.config.Beegfs, err)
+	}
+	m.init = true
+	return nil
+}
+
+func (m *BeegfsMetaCollector) Read(interval time.Duration, output chan lp.CCMetric) {
+	if !m.init {
+		return
+	}
+	//get mounpoint
+	buffer, _ := os.ReadFile(string("/proc/mounts"))
+	mounts := strings.Split(string(buffer), "\n")
+	var mountpoints []string
+	for _, line := range mounts {
+		if len(line) == 0 {
+			continue
+		}
+		f := strings.Fields(line)
+		if strings.Contains(f[0], "beegfs_ondemand") {
+			// Skip excluded filesystems
+			if _, skip := m.skipFS[f[1]]; skip {
+				continue
+			}
+			mountpoints = append(mountpoints, f[1])
+		}
+	}
+
+	if len(mountpoints) == 0 {
+		return
+	}
+
+	for _, mountpoint := range mountpoints {
+		m.tags["filesystem"] = mountpoint
+
+		// bwwgfs-ctl:
+		// --clientstats: Show client IO statistics.
+		// --nodetype=meta: The node type to query (meta, storage).
+		// --interval:
+		// --mount=/mnt/beeond/: Which mount point
+		//cmd := exec.Command(m.config.Beegfs, "/root/mc/test.txt")
+		mountoption := "--mount=" + mountpoint
+		cmd := exec.Command(m.config.Beegfs, "--clientstats",
+			"--nodetype=meta", mountoption, "--allstats")
+		cmd.Stdin = strings.NewReader("\n")
+		cmdStdout := new(bytes.Buffer)
+		cmdStderr := new(bytes.Buffer)
+		cmd.Stdout = cmdStdout
+		cmd.Stderr = cmdStderr
+		err := cmd.Run()
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "BeegfsMetaCollector.Read(): Failed to execute command \"%s\": %s\n", cmd.String(), err.Error())
+			fmt.Fprintf(os.Stderr, "BeegfsMetaCollector.Read(): command exit code: \"%d\"\n", cmd.ProcessState.ExitCode())
+			data, _ := io.ReadAll(cmdStderr)
+			fmt.Fprintf(os.Stderr, "BeegfsMetaCollector.Read(): command stderr: \"%s\"\n", string(data))
+			data, _ = io.ReadAll(cmdStdout)
+			fmt.Fprintf(os.Stderr, "BeegfsMetaCollector.Read(): command stdout: \"%s\"\n", string(data))
+			return
+		}
+		// Read I/O statistics
+		scanner := bufio.NewScanner(cmdStdout)
+
+		sumLine := regexp.MustCompile(`^Sum:\s+\d+\s+\[[a-zA-Z]+\]+`)
+		//Line := regexp.MustCompile(`^(.*)\s+(\d)+\s+\[([a-zA-Z]+)\]+`)
+		statsLine := regexp.MustCompile(`^(.*?)\s+?(\d.*?)$`)
+		singleSpacePattern := regexp.MustCompile(`\s+`)
+		removePattern := regexp.MustCompile(`[\[|\]]`)
+
+		for scanner.Scan() {
+			readLine := scanner.Text()
+			//fmt.Println(readLine)
+			// Jump few lines, we only want the I/O stats from nodes
+			if !sumLine.MatchString(readLine) {
+				continue
+			}
+
+			match := statsLine.FindStringSubmatch(readLine)
+			// nodeName = "Sum:" or would be nodes
+			// nodeName := match[1]
+			//Remove multiple whitespaces
+			dummy := removePattern.ReplaceAllString(match[2], " ")
+			metaStats := strings.TrimSpace(singleSpacePattern.ReplaceAllString(dummy, " "))
+			split := strings.Split(metaStats, " ")
+
+			// fill map with values
+			// split[i+1] = mdname
+			// split[i] = amount of md operations
+			for i := 0; i <= len(split)-1; i += 2 {
+				if _, ok := m.matches[split[i+1]]; ok {
+					m.matches["beegfs_cmeta_"+split[i+1]] = split[i]
+				} else {
+					f1, err := strconv.ParseFloat(m.matches["other"], 32)
+					if err != nil {
+						cclog.ComponentError(
+							m.name,
+							fmt.Sprintf("Metric (other): Failed to convert str written '%s' to float: %v", m.matches["other"], err))
+						continue
+					}
+					f2, err := strconv.ParseFloat(split[i], 32)
+					if err != nil {
+						cclog.ComponentError(
+							m.name,
+							fmt.Sprintf("Metric (other): Failed to convert str written '%s' to float: %v", m.matches["other"], err))
+						continue
+					}
+					//mdStat["other"] = fmt.Sprintf("%f", f1+f2)
+					m.matches["beegfs_cstorage_other"] = fmt.Sprintf("%f", f1+f2)
+				}
+			}
+
+			for key, data := range m.matches {
+				value, _ := strconv.ParseFloat(data, 32)
+				y, err := lp.New(key, m.tags, m.meta, map[string]interface{}{"value": value}, time.Now())
+				if err == nil {
+					output <- y
+				}
+			}
+		}
+	}
+}
+
+func (m *BeegfsMetaCollector) Close() {
+	m.init = false
+}
--- a/collectors/beegfsmetaMetric.md
+++ b/collectors/beegfsmetaMetric.md
@@ -0,0 +1,75 @@
+## `BeeGFS on Demand` collector
+This Collector is to collect BeeGFS on Demand (BeeOND) metadata clientstats.
+
+```json
+  "beegfs_meta": {
+	"beegfs_path": "/usr/bin/beegfs-ctl",
+    "exclude_filesystem": [
+      "/mnt/ignore_me"
+    ],
+    "exclude_metrics": [     
+          "ack",
+          "entInf",
+          "fndOwn"
+    ]
+  }
+```
+
+The `BeeGFS On Demand (BeeOND)` collector uses the `beegfs-ctl` command to read performance metrics for
+BeeGFS filesystems.
+
+The reported filesystems can be filtered with the `exclude_filesystem` option
+in the configuration.
+
+The path to the `beegfs-ctl` command can be configured with the `beegfs_path` option
+in the configuration.
+
+When using the `exclude_metrics` option, the excluded metrics are summed as `other`.
+
+Important: The metrics listed below, are similar to the naming of BeeGFS. The Collector prefixes these with `beegfs_cstorage`(beegfs client storage).
+
+For example beegfs metric `open`-> `beegfs_cstorage_open`
+
+Available Metrics:
+
+* sum
+* ack
+* close
+* entInf
+* fndOwn
+* mkdir
+* create
+* rddir
+* refrEnt
+* mdsInf
+* rmdir
+* rmLnk
+* mvDirIns
+* mvFiIns
+* open
+* ren
+* sChDrct
+* sAttr
+* sDirPat
+* stat
+* statfs
+* trunc
+* symlnk
+* unlnk
+* lookLI
+* statLI
+* revalLI
+* openLI
+* createLI
+* hardlnk
+* flckAp
+* flckEn
+* flckRg
+* dirparent
+* listXA
+* getXA
+* rmXA
+* setXA
+* mirror
+
+The collector adds a `filesystem` tag to all metrics
--- a/collectors/beegfsstorageMetric.go
+++ b/collectors/beegfsstorageMetric.go
@@ -0,0 +1,222 @@
+package collectors
+
+import (
+	"bufio"
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"io"
+	"os"
+	"os/exec"
+	"os/user"
+	"regexp"
+	"strconv"
+	"strings"
+	"time"
+
+	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
+)
+
+// Struct for the collector-specific JSON config
+type BeegfsStorageCollectorConfig struct {
+	Beegfs            string   `json:"beegfs_path"`
+	ExcludeMetrics    []string `json:"exclude_metrics,omitempty"`
+	ExcludeFilesystem []string `json:"exclude_filesystem"`
+}
+
+type BeegfsStorageCollector struct {
+	metricCollector
+	tags    map[string]string
+	matches map[string]string
+	config  BeegfsStorageCollectorConfig
+	skipFS  map[string]struct{}
+}
+
+func (m *BeegfsStorageCollector) Init(config json.RawMessage) error {
+	// Check if already initialized
+	if m.init {
+		return nil
+	}
+	// Metrics
+	var storageStat_array = [18]string{
+		"sum", "ack", "sChDrct", "getFSize",
+		"sAttr", "statfs", "trunc", "close",
+		"fsync", "ops-rd", "MiB-rd/s", "ops-wr",
+		"MiB-wr/s", "gendbg", "hrtbeat", "remNode",
+		"storInf", "unlnk"}
+
+	m.name = "BeegfsStorageCollector"
+	m.setup()
+	m.parallel = true
+	// Set default beegfs-ctl binary
+
+	m.config.Beegfs = DEFAULT_BEEGFS_CMD
+
+	// Read JSON configuration
+	if len(config) > 0 {
+		err := json.Unmarshal(config, &m.config)
+		if err != nil {
+			return err
+		}
+	}
+	println(m.config.Beegfs)
+	//create map with possible variables
+	m.matches = make(map[string]string)
+	for _, value := range storageStat_array {
+		_, skip := stringArrayContains(m.config.ExcludeMetrics, value)
+		if skip {
+			m.matches["other"] = "0"
+		} else {
+			m.matches["beegfs_cstorage_"+value] = "0"
+		}
+	}
+
+	m.meta = map[string]string{
+		"source": m.name,
+		"group":  "BeegfsStorage",
+	}
+	m.tags = map[string]string{
+		"type":       "node",
+		"filesystem": "",
+	}
+	m.skipFS = make(map[string]struct{})
+	for _, fs := range m.config.ExcludeFilesystem {
+		m.skipFS[fs] = struct{}{}
+	}
+
+	// Beegfs file system statistics can only be queried by user root
+	user, err := user.Current()
+	if err != nil {
+		return fmt.Errorf("BeegfsStorageCollector.Init(): Failed to get current user: %v", err)
+	}
+	if user.Uid != "0" {
+		return fmt.Errorf("BeegfsStorageCollector.Init(): BeeGFS file system statistics can only be queried by user root")
+	}
+
+	// Check if beegfs-ctl is in executable search path
+	_, err = exec.LookPath(m.config.Beegfs)
+	if err != nil {
+		return fmt.Errorf("BeegfsStorageCollector.Init(): Failed to find beegfs-ctl binary '%s': %v", m.config.Beegfs, err)
+	}
+	m.init = true
+	return nil
+}
+
+func (m *BeegfsStorageCollector) Read(interval time.Duration, output chan lp.CCMetric) {
+	if !m.init {
+		return
+	}
+	//get mounpoint
+	buffer, _ := os.ReadFile(string("/proc/mounts"))
+	mounts := strings.Split(string(buffer), "\n")
+	var mountpoints []string
+	for _, line := range mounts {
+		if len(line) == 0 {
+			continue
+		}
+		f := strings.Fields(line)
+		if strings.Contains(f[0], "beegfs_ondemand") {
+			// Skip excluded filesystems
+			if _, skip := m.skipFS[f[1]]; skip {
+				continue
+			}
+			mountpoints = append(mountpoints, f[1])
+		}
+	}
+	if len(mountpoints) == 0 {
+		return
+	}
+	// collects stats for each BeeGFS on Demand FS
+	for _, mountpoint := range mountpoints {
+		m.tags["filesystem"] = mountpoint
+
+		// bwwgfs-ctl:
+		// --clientstats: Show client IO statistics.
+		// --nodetype=meta: The node type to query (meta, storage).
+		// --interval:
+		// --mount=/mnt/beeond/: Which mount point
+		//cmd := exec.Command(m.config.Beegfs, "/root/mc/test.txt")
+		mountoption := "--mount=" + mountpoint
+		cmd := exec.Command(m.config.Beegfs, "--clientstats",
+			"--nodetype=storage", mountoption, "--allstats")
+		cmd.Stdin = strings.NewReader("\n")
+		cmdStdout := new(bytes.Buffer)
+		cmdStderr := new(bytes.Buffer)
+		cmd.Stdout = cmdStdout
+		cmd.Stderr = cmdStderr
+		err := cmd.Run()
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "BeegfsStorageCollector.Read(): Failed to execute command \"%s\": %s\n", cmd.String(), err.Error())
+			fmt.Fprintf(os.Stderr, "BeegfsStorageCollector.Read(): command exit code: \"%d\"\n", cmd.ProcessState.ExitCode())
+			data, _ := io.ReadAll(cmdStderr)
+			fmt.Fprintf(os.Stderr, "BeegfsStorageCollector.Read(): command stderr: \"%s\"\n", string(data))
+			data, _ = io.ReadAll(cmdStdout)
+			fmt.Fprintf(os.Stderr, "BeegfsStorageCollector.Read(): command stdout: \"%s\"\n", string(data))
+			return
+		}
+		// Read I/O statistics
+		scanner := bufio.NewScanner(cmdStdout)
+
+		sumLine := regexp.MustCompile(`^Sum:\s+\d+\s+\[[a-zA-Z]+\]+`)
+		//Line := regexp.MustCompile(`^(.*)\s+(\d)+\s+\[([a-zA-Z]+)\]+`)
+		statsLine := regexp.MustCompile(`^(.*?)\s+?(\d.*?)$`)
+		singleSpacePattern := regexp.MustCompile(`\s+`)
+		removePattern := regexp.MustCompile(`[\[|\]]`)
+
+		for scanner.Scan() {
+			readLine := scanner.Text()
+			//fmt.Println(readLine)
+			// Jump few lines, we only want the I/O stats from nodes
+			if !sumLine.MatchString(readLine) {
+				continue
+			}
+
+			match := statsLine.FindStringSubmatch(readLine)
+			// nodeName = "Sum:" or would be nodes
+			// nodeName := match[1]
+			//Remove multiple whitespaces
+			dummy := removePattern.ReplaceAllString(match[2], " ")
+			metaStats := strings.TrimSpace(singleSpacePattern.ReplaceAllString(dummy, " "))
+			split := strings.Split(metaStats, " ")
+
+			// fill map with values
+			// split[i+1] = mdname
+			// split[i] = amount of operations
+			for i := 0; i <= len(split)-1; i += 2 {
+				if _, ok := m.matches[split[i+1]]; ok {
+					m.matches["beegfs_cstorage_"+split[i+1]] = split[i]
+					//m.matches[split[i+1]] = split[i]
+				} else {
+					f1, err := strconv.ParseFloat(m.matches["other"], 32)
+					if err != nil {
+						cclog.ComponentError(
+							m.name,
+							fmt.Sprintf("Metric (other): Failed to convert str written '%s' to float: %v", m.matches["other"], err))
+						continue
+					}
+					f2, err := strconv.ParseFloat(split[i], 32)
+					if err != nil {
+						cclog.ComponentError(
+							m.name,
+							fmt.Sprintf("Metric (other): Failed to convert str written '%s' to float: %v", m.matches["other"], err))
+						continue
+					}
+					m.matches["beegfs_cstorage_other"] = fmt.Sprintf("%f", f1+f2)
+				}
+			}
+
+			for key, data := range m.matches {
+				value, _ := strconv.ParseFloat(data, 32)
+				y, err := lp.New(key, m.tags, m.meta, map[string]interface{}{"value": value}, time.Now())
+				if err == nil {
+					output <- y
+				}
+			}
+		}
+	}
+}
+
+func (m *BeegfsStorageCollector) Close() {
+	m.init = false
+}
--- a/collectors/beegfsstorageMetric.md
+++ b/collectors/beegfsstorageMetric.md
@@ -0,0 +1,55 @@
+## `BeeGFS on Demand` collector
+This Collector is to collect BeeGFS on Demand (BeeOND) storage stats.
+
+```json
+  "beegfs_storage": {
+	"beegfs_path": "/usr/bin/beegfs-ctl",
+    "exclude_filesystem": [
+      "/mnt/ignore_me"
+    ],
+    "exclude_metrics": [     
+          "ack",
+		  "storInf",
+		  "unlnk"
+    ]
+  }
+```
+
+The `BeeGFS On Demand (BeeOND)` collector uses the `beegfs-ctl` command to read performance metrics for BeeGFS filesystems.
+
+The reported filesystems can be filtered with the `exclude_filesystem` option
+in the configuration.
+
+The path to the `beegfs-ctl` command can be configured with the `beegfs_path` option
+in the configuration.
+
+When using the `exclude_metrics` option, the excluded metrics are summed as `other`.
+
+Important: The metrics listed below, are similar to the naming of BeeGFS. The Collector prefixes these with `beegfs_cstorage_`(beegfs client meta).
+For example beegfs metric `open`-> `beegfs_cstorage_`
+
+Note: BeeGFS FS offers many Metadata Information. Probably it makes sense to exlcude most of them. Nevertheless, these excluded metrics will be summed as `beegfs_cstorage_other`. 
+
+Available Metrics:
+
+* "sum"
+* "ack"
+* "sChDrct" 
+* "getFSize"
+* "sAttr"
+* "statfs"
+* "trunc"
+* "close"
+* "fsync"
+* "ops-rd"
+* "MiB-rd/s" 
+* "ops-wr"
+* "MiB-wr/s" 
+* "endbg" 
+* "hrtbeat"
+* "remNode"
+* "storInf"
+* "unlnk"
+
+
+The collector adds a `filesystem` tag to all metrics
--- a/collectors/collectorManager.go
+++ b/collectors/collectorManager.go
@@ -6,43 +6,55 @@ import (
 	"sync"
 	"time"

-	cclog "github.com/ClusterCockpit/cc-metric-collector/internal/ccLogger"
-	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
-	mct "github.com/ClusterCockpit/cc-metric-collector/internal/multiChanTicker"
+	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
+	mct "github.com/ClusterCockpit/cc-metric-collector/pkg/multiChanTicker"
 )

 // Map of all available metric collectors
 var AvailableCollectors = map[string]MetricCollector{

-	"likwid":           new(LikwidCollector),
-	"loadavg":          new(LoadavgCollector),
-	"memstat":          new(MemstatCollector),
-	"netstat":          new(NetstatCollector),
-	"ibstat":           new(InfinibandCollector),
-	"ibstat_perfquery": new(InfinibandPerfQueryCollector),
-	"lustrestat":       new(LustreCollector),
-	"cpustat":          new(CpustatCollector),
-	"topprocs":         new(TopProcsCollector),
-	"nvidia":           new(NvidiaCollector),
-	"customcmd":        new(CustomCmdCollector),
-	"diskstat":         new(DiskstatCollector),
-	"tempstat":         new(TempCollector),
-	"ipmistat":         new(IpmiCollector),
-	"gpfs":             new(GpfsCollector),
-	"cpufreq":          new(CPUFreqCollector),
-	"cpufreq_cpuinfo":  new(CPUFreqCpuInfoCollector),
-	"nfsstat":          new(NfsCollector),
+	"likwid":          new(LikwidCollector),
+	"loadavg":         new(LoadavgCollector),
+	"memstat":         new(MemstatCollector),
+	"netstat":         new(NetstatCollector),
+	"ibstat":          new(InfinibandCollector),
+	"lustrestat":      new(LustreCollector),
+	"cpustat":         new(CpustatCollector),
+	"topprocs":        new(TopProcsCollector),
+	"nvidia":          new(NvidiaCollector),
+	"customcmd":       new(CustomCmdCollector),
+	"iostat":          new(IOstatCollector),
+	"diskstat":        new(DiskstatCollector),
+	"tempstat":        new(TempCollector),
+	"ipmistat":        new(IpmiCollector),
+	"gpfs":            new(GpfsCollector),
+	"cpufreq":         new(CPUFreqCollector),
+	"cpufreq_cpuinfo": new(CPUFreqCpuInfoCollector),
+	"nfs3stat":        new(Nfs3Collector),
+	"nfs4stat":        new(Nfs4Collector),
+	"numastats":       new(NUMAStatsCollector),
+	"beegfs_meta":     new(BeegfsMetaCollector),
+	"beegfs_storage":  new(BeegfsStorageCollector),
+	"rapl":            new(RAPLCollector),
+	"rocm_smi":        new(RocmSmiCollector),
+	"self":            new(SelfCollector),
+	"schedstat":       new(SchedstatCollector),
+	"nfsiostat":       new(NfsIOStatCollector),
 }

 // Metric collector manager data structure
 type collectorManager struct {
-	collectors []MetricCollector          // List of metric collectors to use
-	output     chan lp.CCMetric           // Output channels
-	done       chan bool                  // channel to finish / stop metric collector manager
-	ticker     mct.MultiChanTicker        // periodically ticking once each interval
-	duration   time.Duration              // duration (for metrics that measure over a given duration)
-	wg         *sync.WaitGroup            // wait group for all goroutines in cc-metric-collector
-	config     map[string]json.RawMessage // json encoded config for collector manager
+	collectors   []MetricCollector          // List of metric collectors to read in parallel
+	serial       []MetricCollector          // List of metric collectors to read serially
+	output       chan lp.CCMetric           // Output channels
+	done         chan bool                  // channel to finish / stop metric collector manager
+	ticker       mct.MultiChanTicker        // periodically ticking once each interval
+	duration     time.Duration              // duration (for metrics that measure over a given duration)
+	wg           *sync.WaitGroup            // wait group for all goroutines in cc-metric-collector
+	config       map[string]json.RawMessage // json encoded config for collector manager
+	collector_wg sync.WaitGroup             // internally used wait group for the parallel reading of collector
+	parallel_run bool                       // Flag whether the collectors are currently read in parallel
 }

 // Metric collector manager access functions
@@ -62,6 +74,7 @@ type CollectorManager interface {
 // Initialization is done for all configured collectors
 func (cm *collectorManager) Init(ticker mct.MultiChanTicker, duration time.Duration, wg *sync.WaitGroup, collectConfigFile string) error {
 	cm.collectors = make([]MetricCollector, 0)
+	cm.serial = make([]MetricCollector, 0)
 	cm.output = nil
 	cm.done = make(chan bool)
 	cm.wg = wg
@@ -96,7 +109,11 @@ func (cm *collectorManager) Init(ticker mct.MultiChanTicker, duration time.Durat
 			continue
 		}
 		cclog.ComponentDebug("CollectorManager", "ADD COLLECTOR", collector.Name())
-		cm.collectors = append(cm.collectors, collector)
+		if collector.Parallel() {
+			cm.collectors = append(cm.collectors, collector)
+		} else {
+			cm.serial = append(cm.serial, collector)
+		}
 	}
 	return nil
 }
@@ -112,6 +129,10 @@ func (cm *collectorManager) Start() {
 		// Collector manager is done
 		done := func() {
 			// close all metric collectors
+			if cm.parallel_run {
+				cm.collector_wg.Wait()
+				cm.parallel_run = false
+			}
 			for _, c := range cm.collectors {
 				c.Close()
 			}
@@ -126,7 +147,26 @@ func (cm *collectorManager) Start() {
 				done()
 				return
 			case t := <-tick:
+				cm.parallel_run = true
 				for _, c := range cm.collectors {
+					// Wait for done signal or execute the collector
+					select {
+					case <-cm.done:
+						done()
+						return
+					default:
+						// Read metrics from collector c via goroutine
+						cclog.ComponentDebug("CollectorManager", c.Name(), t)
+						cm.collector_wg.Add(1)
+						go func(myc MetricCollector) {
+							myc.Read(cm.duration, cm.output)
+							cm.collector_wg.Done()
+						}(c)
+					}
+				}
+				cm.collector_wg.Wait()
+				cm.parallel_run = false
+				for _, c := range cm.serial {
 					// Wait for done signal or execute the collector
 					select {
 					case <-cm.done:
--- a/collectors/cpufreqCpuinfoMetric.go
+++ b/collectors/cpufreqCpuinfoMetric.go
@@ -5,33 +5,22 @@ import (
 	"encoding/json"

 	"fmt"
-	"log"
 	"os"
 	"strconv"
 	"strings"
 	"time"
-	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"

+	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
 )

-//
 // CPUFreqCollector
 // a metric collector to measure the current frequency of the CPUs
 // as obtained from /proc/cpuinfo
 // Only measure on the first hyperthread
-//
 type CPUFreqCpuInfoCollectorTopology struct {
-	processor               string // logical processor number (continuous, starting at 0)
-	coreID                  string // socket local core ID
-	coreID_int              int
-	physicalPackageID       string // socket / package ID
-	physicalPackageID_int   int
-	numPhysicalPackages     string // number of  sockets / packages
-	numPhysicalPackages_int int
-	isHT                    bool
-	numNonHT                string // number of non hyperthreading processors
-	numNonHT_int            int
-	tagSet                  map[string]string
+	isHT   bool
+	tagSet map[string]string
 }

 type CPUFreqCpuInfoCollector struct {
@@ -40,28 +29,37 @@ type CPUFreqCpuInfoCollector struct {
 }

 func (m *CPUFreqCpuInfoCollector) Init(config json.RawMessage) error {
+	// Check if already initialized
+	if m.init {
+		return nil
+	}
+
+	m.setup()
+
 	m.name = "CPUFreqCpuInfoCollector"
+	m.parallel = true
 	m.meta = map[string]string{
 		"source": m.name,
-		"group":  "cpufreq",
+		"group":  "CPU",
+		"unit":   "MHz",
 	}

 	const cpuInfoFile = "/proc/cpuinfo"
 	file, err := os.Open(cpuInfoFile)
 	if err != nil {
-		return fmt.Errorf("Failed to open '%s': %v", cpuInfoFile, err)
+		return fmt.Errorf("failed to open file '%s': %v", cpuInfoFile, err)
 	}
 	defer file.Close()

 	// Collect topology information from file cpuinfo
 	foundFreq := false
 	processor := ""
-	numNonHT_int := 0
 	coreID := ""
 	physicalPackageID := ""
-	maxPhysicalPackageID := 0
 	m.topology = make([]CPUFreqCpuInfoCollectorTopology, 0)
 	coreSeenBefore := make(map[string]bool)
+
+	// Read cpuinfo file, line by line
 	scanner := bufio.NewScanner(file)
 	for scanner.Scan() {
 		lineSplit := strings.Split(scanner.Text(), ":")
@@ -87,39 +85,22 @@ func (m *CPUFreqCpuInfoCollector) Init(config json.RawMessage) error {
 			len(coreID) > 0 &&
 			len(physicalPackageID) > 0 {

-			coreID_int, err := strconv.Atoi(coreID)
-			if err != nil {
-				return fmt.Errorf("Unable to convert coreID to int: %v", err)
-			}
-			physicalPackageID_int, err := strconv.Atoi(physicalPackageID)
-			if err != nil {
-				return fmt.Errorf("Unable to convert physicalPackageID to int: %v", err)
-			}
-
-			// increase maximun socket / package ID, when required
-			if physicalPackageID_int > maxPhysicalPackageID {
-				maxPhysicalPackageID = physicalPackageID_int
-			}
-
 			globalID := physicalPackageID + ":" + coreID
-			isHT := coreSeenBefore[globalID]
-			coreSeenBefore[globalID] = true
-			if !isHT {
-				// increase number on non hyper thread cores
-				numNonHT_int++
-			}

 			// store collected topology information
-			m.topology = append(
-				m.topology,
+			m.topology = append(m.topology,
 				CPUFreqCpuInfoCollectorTopology{
-					processor:             processor,
-					coreID:                coreID,
-					coreID_int:            coreID_int,
-					physicalPackageID:     physicalPackageID,
-					physicalPackageID_int: physicalPackageID_int,
-					isHT:                  isHT,
-				})
+					isHT: coreSeenBefore[globalID],
+					tagSet: map[string]string{
+						"type":       "hwthread",
+						"type-id":    processor,
+						"package_id": physicalPackageID,
+					},
+				},
+			)
+
+			// mark core as seen before
+			coreSeenBefore[globalID] = true

 			// reset topology information
 			foundFreq = false
@@ -129,37 +110,27 @@ func (m *CPUFreqCpuInfoCollector) Init(config json.RawMessage) error {
 		}
 	}

-	numPhysicalPackageID_int := maxPhysicalPackageID + 1
-	numPhysicalPackageID := fmt.Sprint(numPhysicalPackageID_int)
-	numNonHT := fmt.Sprint(numNonHT_int)
-	for i := range m.topology {
-		t := &m.topology[i]
-		t.numPhysicalPackages = numPhysicalPackageID
-		t.numPhysicalPackages_int = numPhysicalPackageID_int
-		t.numNonHT = numNonHT
-		t.numNonHT_int = numNonHT_int
-		t.tagSet = map[string]string{
-			"type":        "cpu",
-			"type-id":     t.processor,
-			"num_core":    t.numNonHT,
-			"package_id":  t.physicalPackageID,
-			"num_package": t.numPhysicalPackages,
-		}
+	// Check if at least one CPU with frequency information was detected
+	if len(m.topology) == 0 {
+		return fmt.Errorf("No CPU frequency info found in %s", cpuInfoFile)
 	}

 	m.init = true
 	return nil
 }

-
 func (m *CPUFreqCpuInfoCollector) Read(interval time.Duration, output chan lp.CCMetric) {
+	// Check if already initialized
 	if !m.init {
 		return
 	}
+
 	const cpuInfoFile = "/proc/cpuinfo"
 	file, err := os.Open(cpuInfoFile)
 	if err != nil {
-		log.Printf("Failed to open '%s': %v", cpuInfoFile, err)
+		cclog.ComponentError(
+			m.name,
+			fmt.Sprintf("Read(): Failed to open file '%s': %v", cpuInfoFile, err))
 		return
 	}
 	defer file.Close()
@@ -174,15 +145,16 @@ func (m *CPUFreqCpuInfoCollector) Read(interval time.Duration, output chan lp.CC

 			// frequency
 			if key == "cpu MHz" {
-				t := &m.topology[processorCounter]
+				t := m.topology[processorCounter]
 				if !t.isHT {
 					value, err := strconv.ParseFloat(strings.TrimSpace(lineSplit[1]), 64)
 					if err != nil {
-						log.Printf("Failed to convert cpu MHz to float: %v", err)
+						cclog.ComponentError(
+							m.name,
+							fmt.Sprintf("Read(): Failed to convert cpu MHz '%s' to float64: %v", lineSplit[1], err))
 						return
 					}
-					y, err := lp.New("cpufreq", t.tagSet, m.meta, map[string]interface{}{"value": value}, now)
-					if err == nil {
+					if y, err := lp.New("cpufreq", t.tagSet, m.meta, map[string]interface{}{"value": value}, now); err == nil {
 						output <- y
 					}
 				}
--- a/collectors/cpufreqCpuinfoMetric.md
+++ b/collectors/cpufreqCpuinfoMetric.md
@@ -0,0 +1,11 @@
+## `cpufreq_cpuinfo` collector
+
+```json
+  "cpufreq_cpuinfo": {}
+```
+
+The `cpufreq_cpuinfo` collector reads the clock frequency from `/proc/cpuinfo` and outputs a handful **hwthread** metrics.
+
+Metrics:
+
+* `cpufreq`
--- a/collectors/cpufreqMetric.go
+++ b/collectors/cpufreqMetric.go
@@ -1,60 +1,31 @@
 package collectors

 import (
-	"bufio"
 	"encoding/json"
 	"fmt"
-	"log"
 	"os"
 	"path/filepath"
 	"strconv"
 	"strings"
 	"time"

-	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
+	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
+	"github.com/ClusterCockpit/cc-metric-collector/pkg/ccTopology"
 	"golang.org/x/sys/unix"
 )

-//
-// readOneLine reads one line from a file.
-// It returns ok when file was successfully read.
-// In this case text contains the first line of the files contents.
-//
-func readOneLine(filename string) (text string, ok bool) {
-	file, err := os.Open(filename)
-	if err != nil {
-		return
-	}
-	defer file.Close()
-	scanner := bufio.NewScanner(file)
-	ok = scanner.Scan()
-	text = scanner.Text()
-	return
-}
-
 type CPUFreqCollectorTopology struct {
-	processor               string // logical processor number (continuous, starting at 0)
-	coreID                  string // socket local core ID
-	coreID_int              int
-	physicalPackageID       string // socket / package ID
-	physicalPackageID_int   int
-	numPhysicalPackages     string // number of  sockets / packages
-	numPhysicalPackages_int int
-	isHT                    bool
-	numNonHT                string // number of non hyperthreading processors
-	numNonHT_int            int
-	scalingCurFreqFile      string
-	tagSet                  map[string]string
+	scalingCurFreqFile string
+	tagSet             map[string]string
 }

-//
 // CPUFreqCollector
 // a metric collector to measure the current frequency of the CPUs
 // as obtained from the hardware (in KHz)
-// Only measure on the first hyper thread
+// Only measure on the first hyper-thread
 //
 // See: https://www.kernel.org/doc/html/latest/admin-guide/pm/cpufreq.html
-//
 type CPUFreqCollector struct {
 	metricCollector
 	topology []CPUFreqCollectorTopology
@@ -64,8 +35,14 @@ type CPUFreqCollector struct {
 }

 func (m *CPUFreqCollector) Init(config json.RawMessage) error {
+	// Check if already initialized
+	if m.init {
+		return nil
+	}
+
 	m.name = "CPUFreqCollector"
 	m.setup()
+	m.parallel = true
 	if len(config) > 0 {
 		err := json.Unmarshal(config, &m.config)
 		if err != nil {
@@ -74,116 +51,48 @@ func (m *CPUFreqCollector) Init(config json.RawMessage) error {
 	}
 	m.meta = map[string]string{
 		"source": m.name,
-		"group":  "CPU Frequency",
+		"group":  "CPU",
+		"unit":   "Hz",
 	}

-	// Loop for all CPU directories
-	baseDir := "/sys/devices/system/cpu"
-	globPattern := filepath.Join(baseDir, "cpu[0-9]*")
-	cpuDirs, err := filepath.Glob(globPattern)
-	if err != nil {
-		return fmt.Errorf("CPUFreqCollector.Init() unable to glob files with pattern %s: %v", globPattern, err)
-	}
-	if cpuDirs == nil {
-		return fmt.Errorf("CPUFreqCollector.Init() unable to find any files with pattern %s", globPattern)
-	}
+	m.topology = make([]CPUFreqCollectorTopology, 0)
+	for _, c := range ccTopology.CpuData() {

-	// Initialize CPU topology
-	m.topology = make([]CPUFreqCollectorTopology, len(cpuDirs))
-	for _, cpuDir := range cpuDirs {
-		processor := strings.TrimPrefix(cpuDir, "/sys/devices/system/cpu/cpu")
-		processor_int, err := strconv.Atoi(processor)
-		if err != nil {
-			return fmt.Errorf("CPUFreqCollector.Init() unable to convert cpuID to int: %v", err)
-		}
-
-		// Read package ID
-		physicalPackageIDFile := filepath.Join(cpuDir, "topology", "physical_package_id")
-		physicalPackageID, ok := readOneLine(physicalPackageIDFile)
-		if !ok {
-			return fmt.Errorf("CPUFreqCollector.Init() unable to read physical package ID from %s", physicalPackageIDFile)
-		}
-		physicalPackageID_int, err := strconv.Atoi(physicalPackageID)
-		if err != nil {
-			return fmt.Errorf("CPUFreqCollector.Init() unable to convert packageID to int: %v", err)
-		}
-
-		// Read core ID
-		coreIDFile := filepath.Join(cpuDir, "topology", "core_id")
-		coreID, ok := readOneLine(coreIDFile)
-		if !ok {
-			return fmt.Errorf("CPUFreqCollector.Init() unable to read core ID from %s", coreIDFile)
-		}
-		coreID_int, err := strconv.Atoi(coreID)
-		if err != nil {
-			return fmt.Errorf("CPUFreqCollector.Init() unable to convert coreID to int: %v", err)
+		// Skip hyper threading CPUs
+		if c.CpuID != c.CoreCPUsList[0] {
+			continue
 		}

 		// Check access to current frequency file
-		scalingCurFreqFile := filepath.Join(cpuDir, "cpufreq", "scaling_cur_freq")
-		err = unix.Access(scalingCurFreqFile, unix.R_OK)
+		scalingCurFreqFile := filepath.Join("/sys/devices/system/cpu", fmt.Sprintf("cpu%d", c.CpuID), "cpufreq/scaling_cur_freq")
+		err := unix.Access(scalingCurFreqFile, unix.R_OK)
 		if err != nil {
-			return fmt.Errorf("CPUFreqCollector.Init() unable to access %s: %v", scalingCurFreqFile, err)
+			return fmt.Errorf("unable to access file '%s': %v", scalingCurFreqFile, err)
 		}

-		t := &m.topology[processor_int]
-		t.processor = processor
-		t.physicalPackageID = physicalPackageID
-		t.physicalPackageID_int = physicalPackageID_int
-		t.coreID = coreID
-		t.coreID_int = coreID_int
-		t.scalingCurFreqFile = scalingCurFreqFile
-	}
-
-	// is processor a hyperthread?
-	coreSeenBefore := make(map[string]bool)
-	for i := range m.topology {
-		t := &m.topology[i]
-
-		globalID := t.physicalPackageID + ":" + t.coreID
-		t.isHT = coreSeenBefore[globalID]
-		coreSeenBefore[globalID] = true
-	}
-
-	// number of non hyper thread cores and packages / sockets
-	numNonHT_int := 0
-	maxPhysicalPackageID := 0
-	for i := range m.topology {
-		t := &m.topology[i]
-
-		// Update maxPackageID
-		if t.physicalPackageID_int > maxPhysicalPackageID {
-			maxPhysicalPackageID = t.physicalPackageID_int
-		}
-
-		if !t.isHT {
-			numNonHT_int++
-		}
-	}
-
-	numPhysicalPackageID_int := maxPhysicalPackageID + 1
-	numPhysicalPackageID := fmt.Sprint(numPhysicalPackageID_int)
-	numNonHT := fmt.Sprint(numNonHT_int)
-	for i := range m.topology {
-		t := &m.topology[i]
-		t.numPhysicalPackages = numPhysicalPackageID
-		t.numPhysicalPackages_int = numPhysicalPackageID_int
-		t.numNonHT = numNonHT
-		t.numNonHT_int = numNonHT_int
-		t.tagSet = map[string]string{
-			"type":        "cpu",
-			"type-id":     t.processor,
-			"num_core":    t.numNonHT,
-			"package_id":  t.physicalPackageID,
-			"num_package": t.numPhysicalPackages,
-		}
+		m.topology = append(m.topology,
+			CPUFreqCollectorTopology{
+				tagSet: map[string]string{
+					"type":       "hwthread",
+					"type-id":    fmt.Sprint(c.CpuID),
+					"package_id": fmt.Sprint(c.Socket),
+				},
+				scalingCurFreqFile: scalingCurFreqFile,
+			},
+		)
 	}

+	// Initialized
+	cclog.ComponentDebug(
+		m.name,
+		"initialized",
+		len(m.topology), "non-hyper-threading CPUs")
 	m.init = true
 	return nil
 }

 func (m *CPUFreqCollector) Read(interval time.Duration, output chan lp.CCMetric) {
+	// Check if already initialized
 	if !m.init {
 		return
 	}
@@ -192,25 +101,23 @@ func (m *CPUFreqCollector) Read(interval time.Duration, output chan lp.CCMetric)
 	for i := range m.topology {
 		t := &m.topology[i]

-		// skip hyperthreads
-		if t.isHT {
-			continue
-		}
-
 		// Read current frequency
-		line, ok := readOneLine(t.scalingCurFreqFile)
-		if !ok {
-			log.Printf("CPUFreqCollector.Read(): Failed to read one line from file '%s'", t.scalingCurFreqFile)
+		line, err := os.ReadFile(t.scalingCurFreqFile)
+		if err != nil {
+			cclog.ComponentError(
+				m.name,
+				fmt.Sprintf("Read(): Failed to read file '%s': %v", t.scalingCurFreqFile, err))
 			continue
 		}
-		cpuFreq, err := strconv.Atoi(line)
+		cpuFreq, err := strconv.ParseInt(strings.TrimSpace(string(line)), 10, 64)
 		if err != nil {
-			log.Printf("CPUFreqCollector.Read(): Failed to convert CPU frequency '%s': %v", line, err)
+			cclog.ComponentError(
+				m.name,
+				fmt.Sprintf("Read(): Failed to convert CPU frequency '%s' to int64: %v", line, err))
 			continue
 		}

-		y, err := lp.New("cpufreq", t.tagSet, m.meta, map[string]interface{}{"value": cpuFreq}, now)
-		if err == nil {
+		if y, err := lp.New("cpufreq", t.tagSet, m.meta, map[string]interface{}{"value": cpuFreq}, now); err == nil {
 			output <- y
 		}
 	}
--- a/collectors/cpufreqMetric.md
+++ b/collectors/cpufreqMetric.md
@@ -0,0 +1,13 @@
+## `cpufreq_cpuinfo` collector
+
+```json
+  "cpufreq": {
+    "exclude_metrics": []
+  }
+```
+
+The `cpufreq` collector reads the clock frequency from `/sys/devices/system/cpu/cpu*/cpufreq` and outputs a handful **hwthread** metrics.
+
+Metrics:
+
+* `cpufreq`
--- a/collectors/cpustatMetric.go
+++ b/collectors/cpustatMetric.go
@@ -1,13 +1,17 @@
 package collectors

 import (
+	"bufio"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"strconv"
 	"strings"
 	"time"
-	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
+
+	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
+	sysconf "github.com/tklauser/go-sysconf"
 )

 const CPUSTATFILE = `/proc/stat`
@@ -18,45 +22,116 @@ type CpustatCollectorConfig struct {

 type CpustatCollector struct {
 	metricCollector
-	config CpustatCollectorConfig
+	config        CpustatCollectorConfig
+	lastTimestamp time.Time // Store time stamp of last tick to derive values
+	matches       map[string]int
+	cputags       map[string]map[string]string
+	nodetags      map[string]string
+	olddata       map[string]map[string]int64
 }

 func (m *CpustatCollector) Init(config json.RawMessage) error {
 	m.name = "CpustatCollector"
 	m.setup()
-	m.meta = map[string]string{"source": m.name, "group": "CPU"}
+	m.parallel = true
+	m.meta = map[string]string{"source": m.name, "group": "CPU", "unit": "Percent"}
+	m.nodetags = map[string]string{"type": "node"}
 	if len(config) > 0 {
 		err := json.Unmarshal(config, &m.config)
 		if err != nil {
 			return err
 		}
 	}
+	matches := map[string]int{
+		"cpu_user":       1,
+		"cpu_nice":       2,
+		"cpu_system":     3,
+		"cpu_idle":       4,
+		"cpu_iowait":     5,
+		"cpu_irq":        6,
+		"cpu_softirq":    7,
+		"cpu_steal":      8,
+		"cpu_guest":      9,
+		"cpu_guest_nice": 10,
+	}
+
+	m.matches = make(map[string]int)
+	for match, index := range matches {
+		doExclude := false
+		for _, exclude := range m.config.ExcludeMetrics {
+			if match == exclude {
+				doExclude = true
+				break
+			}
+		}
+		if !doExclude {
+			m.matches[match] = index
+		}
+	}
+
+	// Check input file
+	file, err := os.Open(string(CPUSTATFILE))
+	if err != nil {
+		cclog.ComponentError(m.name, err.Error())
+	}
+	defer file.Close()
+
+	// Pre-generate tags for all CPUs
+	num_cpus := 0
+	m.cputags = make(map[string]map[string]string)
+	m.olddata = make(map[string]map[string]int64)
+	scanner := bufio.NewScanner(file)
+	for scanner.Scan() {
+		line := scanner.Text()
+		linefields := strings.Fields(line)
+		if strings.Compare(linefields[0], "cpu") == 0 {
+			m.olddata["cpu"] = make(map[string]int64)
+			for k, v := range m.matches {
+				m.olddata["cpu"][k], _ = strconv.ParseInt(linefields[v], 0, 64)
+			}
+		} else if strings.HasPrefix(linefields[0], "cpu") && strings.Compare(linefields[0], "cpu") != 0 {
+			cpustr := strings.TrimLeft(linefields[0], "cpu")
+			cpu, _ := strconv.Atoi(cpustr)
+			m.cputags[linefields[0]] = map[string]string{"type": "hwthread", "type-id": fmt.Sprintf("%d", cpu)}
+			m.olddata[linefields[0]] = make(map[string]int64)
+			for k, v := range m.matches {
+				m.olddata[linefields[0]][k], _ = strconv.ParseInt(linefields[v], 0, 64)
+			}
+			num_cpus++
+		}
+	}
+	m.lastTimestamp = time.Now()
 	m.init = true
 	return nil
 }

-func (c *CpustatCollector) parseStatLine(line string, cpu int, exclude []string, output chan lp.CCMetric) {
-	ls := strings.Fields(line)
-	matches := []string{"", "cpu_user", "cpu_nice", "cpu_system", "cpu_idle", "cpu_iowait", "cpu_irq", "cpu_softirq", "cpu_steal", "cpu_guest", "cpu_guest_nice"}
-	for _, ex := range exclude {
-		matches, _ = RemoveFromStringList(matches, ex)
+func (m *CpustatCollector) parseStatLine(linefields []string, tags map[string]string, output chan lp.CCMetric, now time.Time, tsdelta time.Duration) {
+	values := make(map[string]float64)
+	clktck, _ := sysconf.Sysconf(sysconf.SC_CLK_TCK)
+	for match, index := range m.matches {
+		if len(match) > 0 {
+			x, err := strconv.ParseInt(linefields[index], 0, 64)
+			if err == nil {
+				vdiff := x - m.olddata[linefields[0]][match]
+				m.olddata[linefields[0]][match] = x // Store new value for next run
+				values[match] = float64(vdiff) / float64(tsdelta.Seconds()) / float64(clktck)
+			}
+		}
 	}

-	var tags map[string]string
-	if cpu < 0 {
-		tags = map[string]string{"type": "node"}
-	} else {
-		tags = map[string]string{"type": "cpu", "type-id": fmt.Sprintf("%d", cpu)}
+	sum := float64(0)
+	for name, value := range values {
+		sum += value
+		y, err := lp.New(name, tags, m.meta, map[string]interface{}{"value": value * 100}, now)
+		if err == nil {
+			output <- y
+		}
 	}
-	for i, m := range matches {
-		if len(m) > 0 {
-			x, err := strconv.ParseInt(ls[i], 0, 64)
-			if err == nil {
-				y, err := lp.New(m, tags, c.meta, map[string]interface{}{"value": int(x)}, time.Now())
-				if err == nil {
-					output <- y
-				}
-			}
+	if v, ok := values["cpu_idle"]; ok {
+		sum -= v
+		y, err := lp.New("cpu_used", tags, m.meta, map[string]interface{}{"value": sum * 100}, now)
+		if err == nil {
+			output <- y
 		}
 	}
 }
@@ -65,26 +140,39 @@ func (m *CpustatCollector) Read(interval time.Duration, output chan lp.CCMetric)
 	if !m.init {
 		return
 	}
-	buffer, err := ioutil.ReadFile(string(CPUSTATFILE))
+	num_cpus := 0
+	now := time.Now()
+	tsdelta := now.Sub(m.lastTimestamp)

+	file, err := os.Open(string(CPUSTATFILE))
 	if err != nil {
-		return
+		cclog.ComponentError(m.name, err.Error())
+	}
+	defer file.Close()
+
+	scanner := bufio.NewScanner(file)
+	for scanner.Scan() {
+		line := scanner.Text()
+		linefields := strings.Fields(line)
+		if strings.Compare(linefields[0], "cpu") == 0 {
+			m.parseStatLine(linefields, m.nodetags, output, now, tsdelta)
+		} else if strings.HasPrefix(linefields[0], "cpu") {
+			m.parseStatLine(linefields, m.cputags[linefields[0]], output, now, tsdelta)
+			num_cpus++
+		}
 	}

-	ll := strings.Split(string(buffer), "\n")
-	for _, line := range ll {
-		if len(line) == 0 {
-			continue
-		}
-		ls := strings.Fields(line)
-		if strings.Compare(ls[0], "cpu") == 0 {
-			m.parseStatLine(line, -1, m.config.ExcludeMetrics, output)
-		} else if strings.HasPrefix(ls[0], "cpu") {
-			cpustr := strings.TrimLeft(ls[0], "cpu")
-			cpu, _ := strconv.Atoi(cpustr)
-			m.parseStatLine(line, cpu, m.config.ExcludeMetrics, output)
-		}
+	num_cpus_metric, err := lp.New("num_cpus",
+		m.nodetags,
+		m.meta,
+		map[string]interface{}{"value": int(num_cpus)},
+		now,
+	)
+	if err == nil {
+		output <- num_cpus_metric
 	}
+
+	m.lastTimestamp = now
 }

 func (m *CpustatCollector) Close() {
--- a/collectors/cpustatMetric.md
+++ b/collectors/cpustatMetric.md
@@ -1,5 +1,6 @@

 ## `cpustat` collector
+
 ```json
  "cpustat": {
    "exclude_metrics": [
@@ -8,9 +9,10 @@
  }
 ```

-The `cpustat` collector reads data from `/proc/stats` and outputs a handful **node** and **hwthread** metrics. If a metric is not required, it can be excluded from forwarding it to the sink.
+The `cpustat` collector reads data from `/proc/stat` and outputs a handful **node** and **hwthread** metrics. If a metric is not required, it can be excluded from forwarding it to the sink.

 Metrics:
+
 * `cpu_user`
 * `cpu_nice`
 * `cpu_system`
@@ -21,3 +23,4 @@ Metrics:
 * `cpu_steal`
 * `cpu_guest`
 * `cpu_guest_nice`
+* `cpu_used` = `cpu_* - cpu_idle`
--- a/collectors/customCmdMetric.go
+++ b/collectors/customCmdMetric.go
@@ -3,13 +3,13 @@ package collectors
 import (
 	"encoding/json"
 	"errors"
-	"io/ioutil"
 	"log"
+	"os"
 	"os/exec"
 	"strings"
 	"time"

-	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
 	influx "github.com/influxdata/line-protocol"
 )

@@ -33,6 +33,7 @@ type CustomCmdCollector struct {
 func (m *CustomCmdCollector) Init(config json.RawMessage) error {
 	var err error
 	m.name = "CustomCmdCollector"
+	m.parallel = true
 	m.meta = map[string]string{"source": m.name, "group": "Custom"}
 	if len(config) > 0 {
 		err = json.Unmarshal(config, &m.config)
@@ -47,12 +48,12 @@ func (m *CustomCmdCollector) Init(config json.RawMessage) error {
 		command := exec.Command(cmdfields[0], strings.Join(cmdfields[1:], " "))
 		command.Wait()
 		_, err = command.Output()
-		if err != nil {
+		if err == nil {
 			m.commands = append(m.commands, c)
 		}
 	}
 	for _, f := range m.config.Files {
-		_, err = ioutil.ReadFile(f)
+		_, err = os.ReadFile(f)
 		if err == nil {
 			m.files = append(m.files, f)
 		} else {
@@ -61,7 +62,7 @@ func (m *CustomCmdCollector) Init(config json.RawMessage) error {
 		}
 	}
 	if len(m.files) == 0 && len(m.commands) == 0 {
-		return errors.New("No metrics to collect")
+		return errors.New("no metrics to collect")
 	}
 	m.handler = influx.NewMetricHandler()
 	m.parser = influx.NewParser(m.handler)
@@ -97,14 +98,15 @@ func (m *CustomCmdCollector) Read(interval time.Duration, output chan lp.CCMetri
 			if skip {
 				continue
 			}
-			y, err := lp.New(c.Name(), Tags2Map(c), m.meta, Fields2Map(c), c.Time())
+
+			y := lp.FromInfluxMetric(c)
 			if err == nil {
 				output <- y
 			}
 		}
 	}
 	for _, file := range m.files {
-		buffer, err := ioutil.ReadFile(file)
+		buffer, err := os.ReadFile(file)
 		if err != nil {
 			log.Print(err)
 			return
@@ -119,7 +121,7 @@ func (m *CustomCmdCollector) Read(interval time.Duration, output chan lp.CCMetri
 			if skip {
 				continue
 			}
-			y, err := lp.New(f.Name(), Tags2Map(f), m.meta, Fields2Map(f), f.Time())
+			y := lp.FromInfluxMetric(f)
 			if err == nil {
 				output <- y
 			}
--- a/collectors/diskstatMetric.go
+++ b/collectors/diskstatMetric.go
@@ -1,18 +1,20 @@
 package collectors

 import (
-	"io/ioutil"
-	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
-	//	"log"
+	"bufio"
 	"encoding/json"
-	"errors"
-	"strconv"
+	"os"
 	"strings"
+	"syscall"
 	"time"
+
+	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
 )

-const DISKSTATFILE = `/proc/diskstats`
-const DISKSTAT_SYSFSPATH = `/sys/block`
+//	"log"
+
+const MOUNTFILE = `/proc/self/mounts`

 type DiskstatCollectorConfig struct {
 	ExcludeMetrics []string `json:"exclude_metrics,omitempty"`
@@ -20,94 +22,99 @@ type DiskstatCollectorConfig struct {

 type DiskstatCollector struct {
 	metricCollector
-	matches map[int]string
-	config  DiskstatCollectorConfig
+	//matches map[string]int
+	config IOstatCollectorConfig
+	//devices map[string]IOstatCollectorEntry
 }

 func (m *DiskstatCollector) Init(config json.RawMessage) error {
-	var err error
 	m.name = "DiskstatCollector"
+	m.parallel = true
 	m.meta = map[string]string{"source": m.name, "group": "Disk"}
 	m.setup()
 	if len(config) > 0 {
-		err = json.Unmarshal(config, &m.config)
+		err := json.Unmarshal(config, &m.config)
 		if err != nil {
 			return err
 		}
 	}
-	// https://www.kernel.org/doc/html/latest/admin-guide/iostats.html
-	matches := map[int]string{
-		3:  "reads",
-		4:  "reads_merged",
-		5:  "read_sectors",
-		6:  "read_ms",
-		7:  "writes",
-		8:  "writes_merged",
-		9:  "writes_sectors",
-		10: "writes_ms",
-		11: "ioops",
-		12: "ioops_ms",
-		13: "ioops_weighted_ms",
-		14: "discards",
-		15: "discards_merged",
-		16: "discards_sectors",
-		17: "discards_ms",
-		18: "flushes",
-		19: "flushes_ms",
+	file, err := os.Open(string(MOUNTFILE))
+	if err != nil {
+		cclog.ComponentError(m.name, err.Error())
+		return err
 	}
-	m.matches = make(map[int]string)
-	for k, v := range matches {
-		_, skip := stringArrayContains(m.config.ExcludeMetrics, v)
-		if !skip {
-			m.matches[k] = v
-		}
-	}
-	if len(m.matches) == 0 {
-		return errors.New("No metrics to collect")
-	}
-	_, err = ioutil.ReadFile(string(DISKSTATFILE))
-	if err == nil {
-		m.init = true
-	}
-	return err
+	defer file.Close()
+	m.init = true
+	return nil
 }

 func (m *DiskstatCollector) Read(interval time.Duration, output chan lp.CCMetric) {
-	var lines []string
 	if !m.init {
 		return
 	}

-	buffer, err := ioutil.ReadFile(string(DISKSTATFILE))
+	file, err := os.Open(string(MOUNTFILE))
 	if err != nil {
+		cclog.ComponentError(m.name, err.Error())
 		return
 	}
-	lines = strings.Split(string(buffer), "\n")
+	defer file.Close()

-	for _, line := range lines {
+	part_max_used := uint64(0)
+	scanner := bufio.NewScanner(file)
+	for scanner.Scan() {
+		line := scanner.Text()
 		if len(line) == 0 {
 			continue
 		}
-		f := strings.Fields(line)
-		if strings.Contains(f[2], "loop") {
+		if !strings.HasPrefix(line, "/dev") {
 			continue
 		}
-		tags := map[string]string{
-			"device": f[2],
-			"type":   "node",
+		linefields := strings.Fields(line)
+		if strings.Contains(linefields[0], "loop") {
+			continue
 		}
-		for idx, name := range m.matches {
-			if idx < len(f) {
-				x, err := strconv.ParseInt(f[idx], 0, 64)
-				if err == nil {
-					y, err := lp.New(name, tags, m.meta, map[string]interface{}{"value": int(x)}, time.Now())
-					if err == nil {
-						output <- y
-					}
-				}
+		if strings.Contains(linefields[1], "boot") {
+			continue
+		}
+		path := strings.Replace(linefields[1], `\040`, " ", -1)
+		stat := syscall.Statfs_t{
+			Blocks: 0,
+			Bsize:  0,
+			Bfree:  0,
+		}
+		err := syscall.Statfs(path, &stat)
+		if err != nil {
+			continue
+		}
+		if stat.Blocks == 0 || stat.Bsize == 0 {
+			continue
+		}
+		tags := map[string]string{"type": "node", "device": linefields[0]}
+		total := (stat.Blocks * uint64(stat.Bsize)) / uint64(1000000000)
+		y, err := lp.New("disk_total", tags, m.meta, map[string]interface{}{"value": total}, time.Now())
+		if err == nil {
+			y.AddMeta("unit", "GBytes")
+			output <- y
+		}
+		free := (stat.Bfree * uint64(stat.Bsize)) / uint64(1000000000)
+		y, err = lp.New("disk_free", tags, m.meta, map[string]interface{}{"value": free}, time.Now())
+		if err == nil {
+			y.AddMeta("unit", "GBytes")
+			output <- y
+		}
+		if total > 0 {
+			perc := (100 * (total - free)) / total
+			if perc > part_max_used {
+				part_max_used = perc
 			}
 		}
 	}
+	y, err := lp.New("part_max_used", map[string]string{"type": "node"}, m.meta, map[string]interface{}{"value": int(part_max_used)}, time.Now())
+	if err == nil {
+		y.AddMeta("unit", "percent")
+		output <- y
+	}
 }

 func (m *DiskstatCollector) Close() {
--- a/collectors/diskstatMetric.md
+++ b/collectors/diskstatMetric.md
@@ -4,31 +4,18 @@
 ```json
  "diskstat": {
    "exclude_metrics": [
-      "read_ms"
+      "disk_total"
    ],
  }
 ```

-The `netstat` collector reads data from `/proc/net/dev` and outputs a handful **node** metrics. If a metric is not required, it can be excluded from forwarding it to the sink.
+The `diskstat` collector reads data from `/proc/self/mounts` and outputs a handful **node** metrics. If a metric is not required, it can be excluded from forwarding it to the sink.

-Metrics:
-* `reads`
-* `reads_merged`
-* `read_sectors`
-* `read_ms`
-* `writes`
-* `writes_merged`
-* `writes_sectors`
-* `writes_ms`
-* `ioops`
-* `ioops_ms`
-* `ioops_weighted_ms`
-* `discards`
-* `discards_merged`
-* `discards_sectors`
-* `discards_ms`
-* `flushes`
-* `flushes_ms`
+Metrics per device (with `device` tag):
+* `disk_total` (unit `GBytes`)
+* `disk_free` (unit `GBytes`)
+
+Global metrics:
+* `part_max_used` (unit `percent`)

-The device name is added as tag `device`.

--- a/collectors/gpfsMetric.go
+++ b/collectors/gpfsMetric.go
@@ -5,33 +5,52 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
-	"os"
 	"os/exec"
 	"os/user"
 	"strconv"
 	"strings"
 	"time"

-	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
+	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
 )

+const DEFAULT_GPFS_CMD = "mmpmon"
+
+type GpfsCollectorLastState struct {
+	bytesRead    int64
+	bytesWritten int64
+}
+
 type GpfsCollector struct {
 	metricCollector
 	tags   map[string]string
 	config struct {
-		Mmpmon string `json:"mmpmon"`
+		Mmpmon            string   `json:"mmpmon_path,omitempty"`
+		ExcludeFilesystem []string `json:"exclude_filesystem,omitempty"`
+		SendBandwidths    bool     `json:"send_bandwidths"`
+		SendTotalValues   bool     `json:"send_total_values"`
 	}
+	skipFS        map[string]struct{}
+	lastTimestamp time.Time // Store time stamp of last tick to derive bandwidths
+	lastState     map[string]GpfsCollectorLastState
 }

 func (m *GpfsCollector) Init(config json.RawMessage) error {
+	// Check if already initialized
+	if m.init {
+		return nil
+	}
+
 	var err error
 	m.name = "GpfsCollector"
 	m.setup()
+	m.parallel = true

 	// Set default mmpmon binary
-	m.config.Mmpmon = "/usr/lpp/mmfs/bin/mmpmon"
+	m.config.Mmpmon = DEFAULT_GPFS_CMD

 	// Read JSON configuration
 	if len(config) > 0 {
@@ -49,31 +68,45 @@ func (m *GpfsCollector) Init(config json.RawMessage) error {
 		"type":       "node",
 		"filesystem": "",
 	}
+	m.skipFS = make(map[string]struct{})
+	for _, fs := range m.config.ExcludeFilesystem {
+		m.skipFS[fs] = struct{}{}
+	}
+	m.lastState = make(map[string]GpfsCollectorLastState)

 	// GPFS / IBM Spectrum Scale file system statistics can only be queried by user root
 	user, err := user.Current()
 	if err != nil {
-		return fmt.Errorf("GpfsCollector.Init(): Failed to get current user: %v", err)
+		return fmt.Errorf("failed to get current user: %v", err)
 	}
 	if user.Uid != "0" {
-		return fmt.Errorf("GpfsCollector.Init(): GPFS file system statistics can only be queried by user root")
+		return fmt.Errorf("GPFS file system statistics can only be queried by user root")
 	}

 	// Check if mmpmon is in executable search path
-	_, err = exec.LookPath(m.config.Mmpmon)
+	p, err := exec.LookPath(m.config.Mmpmon)
 	if err != nil {
-		return fmt.Errorf("GpfsCollector.Init(): Failed to find mmpmon binary '%s': %v", m.config.Mmpmon, err)
+		return fmt.Errorf("failed to find mmpmon binary '%s': %v", m.config.Mmpmon, err)
 	}
+	m.config.Mmpmon = p

 	m.init = true
 	return nil
 }

 func (m *GpfsCollector) Read(interval time.Duration, output chan lp.CCMetric) {
+	// Check if already initialized
 	if !m.init {
 		return
 	}

+	// Current time stamp
+	now := time.Now()
+	// time difference to last time stamp
+	timeDiff := now.Sub(m.lastTimestamp).Seconds()
+	// Save current timestamp
+	m.lastTimestamp = now
+
 	// mmpmon:
 	// -p: generate output that can be parsed
 	// -s: suppress the prompt on input
@@ -86,12 +119,15 @@ func (m *GpfsCollector) Read(interval time.Duration, output chan lp.CCMetric) {
 	cmd.Stderr = cmdStderr
 	err := cmd.Run()
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "GpfsCollector.Read(): Failed to execute command \"%s\": %s\n", cmd.String(), err.Error())
-		fmt.Fprintf(os.Stderr, "GpfsCollector.Read(): command exit code: \"%d\"\n", cmd.ProcessState.ExitCode())
-		data, _ := ioutil.ReadAll(cmdStderr)
-		fmt.Fprintf(os.Stderr, "GpfsCollector.Read(): command stderr: \"%s\"\n", string(data))
-		data, _ = ioutil.ReadAll(cmdStdout)
-		fmt.Fprintf(os.Stderr, "GpfsCollector.Read(): command stdout: \"%s\"\n", string(data))
+		dataStdErr, _ := io.ReadAll(cmdStderr)
+		dataStdOut, _ := io.ReadAll(cmdStdout)
+		cclog.ComponentError(
+			m.name,
+			fmt.Sprintf("Read(): Failed to execute command \"%s\": %v\n", cmd.String(), err),
+			fmt.Sprintf("Read(): command exit code: \"%d\"\n", cmd.ProcessState.ExitCode()),
+			fmt.Sprintf("Read(): command stderr: \"%s\"\n", string(dataStdErr)),
+			fmt.Sprintf("Read(): command stdout: \"%s\"\n", string(dataStdOut)),
+		)
 		return
 	}

@@ -99,146 +135,276 @@ func (m *GpfsCollector) Read(interval time.Duration, output chan lp.CCMetric) {
 	scanner := bufio.NewScanner(cmdStdout)
 	for scanner.Scan() {
 		lineSplit := strings.Fields(scanner.Text())
-		if lineSplit[0] == "_fs_io_s_" {
-			key_value := make(map[string]string)
-			for i := 1; i < len(lineSplit); i += 2 {
-				key_value[lineSplit[i]] = lineSplit[i+1]
-			}

-			// Ignore keys:
-			// _n_:  node IP address,
-			// _nn_: node name,
-			// _cl_: cluster name,
-			// _d_:  number of disks
+		// Only process lines starting with _fs_io_s_
+		if lineSplit[0] != "_fs_io_s_" {
+			continue
+		}

-			filesystem, ok := key_value["_fs_"]
-			if !ok {
-				fmt.Fprintf(os.Stderr, "GpfsCollector.Read(): Failed to get filesystem name.\n")
-				continue
-			}
+		key_value := make(map[string]string)
+		for i := 1; i < len(lineSplit); i += 2 {
+			key_value[lineSplit[i]] = lineSplit[i+1]
+		}

-			m.tags["filesystem"] = filesystem
+		// Ignore keys:
+		// _n_:  node IP address,
+		// _nn_: node name,
+		// _cl_: cluster name,
+		// _d_:  number of disks

-			// return code
-			rc, err := strconv.Atoi(key_value["_rc_"])
-			if err != nil {
-				fmt.Fprintf(os.Stderr, "GpfsCollector.Read(): Failed to convert return code: %s\n", err.Error())
-				continue
-			}
-			if rc != 0 {
-				fmt.Fprintf(os.Stderr, "GpfsCollector.Read(): Filesystem %s not ok.", filesystem)
-				continue
-			}
+		filesystem, ok := key_value["_fs_"]
+		if !ok {
+			cclog.ComponentError(
+				m.name,
+				"Read(): Failed to get filesystem name.")
+			continue
+		}

-			sec, err := strconv.ParseInt(key_value["_t_"], 10, 64)
-			if err != nil {
-				fmt.Fprintf(os.Stderr,
-					"GpfsCollector.Read(): Failed to convert seconds to int '%s': %v\n",
-					key_value["_t_"], err)
-				continue
-			}
-			msec, err := strconv.ParseInt(key_value["_tu_"], 10, 64)
-			if err != nil {
-				fmt.Fprintf(os.Stderr,
-					"GpfsCollector.Read(): Failed to convert micro seconds to int '%s': %v\n",
-					key_value["_tu_"], err)
-				continue
-			}
-			timestamp := time.Unix(sec, msec*1000)
+		// Skip excluded filesystems
+		if _, skip := m.skipFS[filesystem]; skip {
+			continue
+		}

-			// bytes read
-			bytesRead, err := strconv.ParseInt(key_value["_br_"], 10, 64)
-			if err != nil {
-				fmt.Fprintf(os.Stderr,
-					"GpfsCollector.Read(): Failed to convert bytes read '%s': %s\n",
-					key_value["_br_"], err.Error())
-				continue
-			}
+		// Add filesystem tag
+		m.tags["filesystem"] = filesystem

-			y, err := lp.New("gpfs_bytes_read", m.tags, m.meta, map[string]interface{}{"value": bytesRead}, timestamp)
-			if err == nil {
+		// Create initial last state
+		if m.config.SendBandwidths {
+			if _, ok := m.lastState[filesystem]; !ok {
+				m.lastState[filesystem] = GpfsCollectorLastState{
+					bytesRead:    -1,
+					bytesWritten: -1,
+				}
+			}
+		}
+
+		// return code
+		rc, err := strconv.Atoi(key_value["_rc_"])
+		if err != nil {
+			cclog.ComponentError(
+				m.name,
+				fmt.Sprintf("Read(): Failed to convert return code '%s' to int: %v", key_value["_rc_"], err))
+			continue
+		}
+		if rc != 0 {
+			cclog.ComponentError(
+				m.name,
+				fmt.Sprintf("Read(): Filesystem '%s' is not ok.", filesystem))
+			continue
+		}
+
+		sec, err := strconv.ParseInt(key_value["_t_"], 10, 64)
+		if err != nil {
+			cclog.ComponentError(
+				m.name,
+				fmt.Sprintf("Read(): Failed to convert seconds '%s' to int64: %v", key_value["_t_"], err))
+			continue
+		}
+		msec, err := strconv.ParseInt(key_value["_tu_"], 10, 64)
+		if err != nil {
+			cclog.ComponentError(
+				m.name,
+				fmt.Sprintf("Read(): Failed to convert micro seconds '%s' to int64: %v", key_value["_tu_"], err))
+			continue
+		}
+		timestamp := time.Unix(sec, msec*1000)
+
+		// bytes read
+		bytesRead, err := strconv.ParseInt(key_value["_br_"], 10, 64)
+		if err != nil {
+			cclog.ComponentError(
+				m.name,
+				fmt.Sprintf("Read(): Failed to convert bytes read '%s' to int64: %v", key_value["_br_"], err))
+			continue
+		}
+		if y, err :=
+			lp.New(
+				"gpfs_bytes_read",
+				m.tags,
+				m.meta,
+				map[string]interface{}{
+					"value": bytesRead,
+				},
+				timestamp,
+			); err == nil {
+			y.AddMeta("unit", "bytes")
+			output <- y
+		}
+		if m.config.SendBandwidths {
+			if lastBytesRead := m.lastState[filesystem].bytesRead; lastBytesRead >= 0 {
+				bwRead := float64(bytesRead-lastBytesRead) / timeDiff
+				if y, err :=
+					lp.New(
+						"gpfs_bw_read",
+						m.tags,
+						m.meta,
+						map[string]interface{}{
+							"value": bwRead,
+						},
+						timestamp,
+					); err == nil {
+					y.AddMeta("unit", "bytes/sec")
+					output <- y
+				}
+			}
+		}
+
+		// bytes written
+		bytesWritten, err := strconv.ParseInt(key_value["_bw_"], 10, 64)
+		if err != nil {
+			cclog.ComponentError(
+				m.name,
+				fmt.Sprintf("Read(): Failed to convert bytes written '%s' to int64: %v", key_value["_bw_"], err))
+			continue
+		}
+		if y, err :=
+			lp.New(
+				"gpfs_bytes_written",
+				m.tags,
+				m.meta,
+				map[string]interface{}{
+					"value": bytesWritten,
+				},
+				timestamp,
+			); err == nil {
+			y.AddMeta("unit", "bytes")
+			output <- y
+		}
+		if m.config.SendBandwidths {
+			if lastBytesWritten := m.lastState[filesystem].bytesRead; lastBytesWritten >= 0 {
+				bwWrite := float64(bytesWritten-lastBytesWritten) / timeDiff
+				if y, err :=
+					lp.New(
+						"gpfs_bw_write",
+						m.tags,
+						m.meta,
+						map[string]interface{}{
+							"value": bwWrite,
+						},
+						timestamp,
+					); err == nil {
+					y.AddMeta("unit", "bytes/sec")
+					output <- y
+				}
+			}
+		}
+
+		if m.config.SendBandwidths {
+			m.lastState[filesystem] = GpfsCollectorLastState{
+				bytesRead:    bytesRead,
+				bytesWritten: bytesWritten,
+			}
+		}
+
+		// number of opens
+		numOpens, err := strconv.ParseInt(key_value["_oc_"], 10, 64)
+		if err != nil {
+			cclog.ComponentError(
+				m.name,
+				fmt.Sprintf("Read(): Failed to convert number of opens '%s' to int64: %v", key_value["_oc_"], err))
+			continue
+		}
+		if y, err := lp.New("gpfs_num_opens", m.tags, m.meta, map[string]interface{}{"value": numOpens}, timestamp); err == nil {
+			output <- y
+		}
+
+		// number of closes
+		numCloses, err := strconv.ParseInt(key_value["_cc_"], 10, 64)
+		if err != nil {
+			cclog.ComponentError(
+				m.name,
+				fmt.Sprintf("Read(): Failed to convert number of closes: '%s' to int64: %v", key_value["_cc_"], err))
+			continue
+		}
+		if y, err := lp.New("gpfs_num_closes", m.tags, m.meta, map[string]interface{}{"value": numCloses}, timestamp); err == nil {
+			output <- y
+		}
+
+		// number of reads
+		numReads, err := strconv.ParseInt(key_value["_rdc_"], 10, 64)
+		if err != nil {
+			cclog.ComponentError(
+				m.name,
+				fmt.Sprintf("Read(): Failed to convert number of reads: '%s' to int64: %v", key_value["_rdc_"], err))
+			continue
+		}
+		if y, err := lp.New("gpfs_num_reads", m.tags, m.meta, map[string]interface{}{"value": numReads}, timestamp); err == nil {
+			output <- y
+		}
+
+		// number of writes
+		numWrites, err := strconv.ParseInt(key_value["_wc_"], 10, 64)
+		if err != nil {
+			cclog.ComponentError(
+				m.name,
+				fmt.Sprintf("Read(): Failed to convert number of writes: '%s' to int64: %v", key_value["_wc_"], err))
+			continue
+		}
+		if y, err := lp.New("gpfs_num_writes", m.tags, m.meta, map[string]interface{}{"value": numWrites}, timestamp); err == nil {
+			output <- y
+		}
+
+		// number of read directories
+		numReaddirs, err := strconv.ParseInt(key_value["_dir_"], 10, 64)
+		if err != nil {
+			cclog.ComponentError(
+				m.name,
+				fmt.Sprintf("Read(): Failed to convert number of read directories: '%s' to int64: %v", key_value["_dir_"], err))
+			continue
+		}
+		if y, err := lp.New("gpfs_num_readdirs", m.tags, m.meta, map[string]interface{}{"value": numReaddirs}, timestamp); err == nil {
+			output <- y
+		}
+
+		// Number of inode updates
+		numInodeUpdates, err := strconv.ParseInt(key_value["_iu_"], 10, 64)
+		if err != nil {
+			cclog.ComponentError(
+				m.name,
+				fmt.Sprintf("Read(): Failed to convert number of inode updates: '%s' to int: %v", key_value["_iu_"], err))
+			continue
+		}
+		if y, err := lp.New("gpfs_num_inode_updates", m.tags, m.meta, map[string]interface{}{"value": numInodeUpdates}, timestamp); err == nil {
+			output <- y
+		}
+
+		// Total values
+		if m.config.SendTotalValues {
+			bytesTotal := bytesRead + bytesWritten
+			if y, err :=
+				lp.New("gpfs_bytes_total",
+					m.tags,
+					m.meta,
+					map[string]interface{}{
+						"value": bytesTotal,
+					},
+					timestamp,
+				); err == nil {
+				y.AddMeta("unit", "bytes")
 				output <- y
 			}
-
-			// bytes written
-			bytesWritten, err := strconv.ParseInt(key_value["_bw_"], 10, 64)
-			if err != nil {
-				fmt.Fprintf(os.Stderr,
-					"GpfsCollector.Read(): Failed to convert bytes written '%s': %s\n",
-					key_value["_bw_"], err.Error())
-				continue
-			}
-
-			y, err = lp.New("gpfs_bytes_written", m.tags, m.meta, map[string]interface{}{"value": bytesWritten}, timestamp)
-			if err == nil {
+			iops := numReads + numWrites
+			if y, err :=
+				lp.New("gpfs_iops",
+					m.tags,
+					m.meta,
+					map[string]interface{}{
+						"value": iops,
+					},
+					timestamp,
+				); err == nil {
 				output <- y
 			}
-
-			// number of opens
-			numOpens, err := strconv.ParseInt(key_value["_oc_"], 10, 64)
-			if err != nil {
-				fmt.Fprintf(os.Stderr,
-					"GpfsCollector.Read(): Failed to convert number of opens '%s': %s\n",
-					key_value["_oc_"], err.Error())
-				continue
-			}
-			y, err = lp.New("gpfs_num_opens", m.tags, m.meta, map[string]interface{}{"value": numOpens}, timestamp)
-			if err == nil {
-				output <- y
-			}
-
-			// number of closes
-			numCloses, err := strconv.ParseInt(key_value["_cc_"], 10, 64)
-			if err != nil {
-				fmt.Fprintf(os.Stderr, "GpfsCollector.Read(): Failed to convert number of closes: %s\n", err.Error())
-				continue
-			}
-			y, err = lp.New("gpfs_num_closes", m.tags, m.meta, map[string]interface{}{"value": numCloses}, timestamp)
-			if err == nil {
-				output <- y
-			}
-
-			// number of reads
-			numReads, err := strconv.ParseInt(key_value["_rdc_"], 10, 64)
-			if err != nil {
-				fmt.Fprintf(os.Stderr, "GpfsCollector.Read(): Failed to convert number of reads: %s\n", err.Error())
-				continue
-			}
-			y, err = lp.New("gpfs_num_reads", m.tags, m.meta, map[string]interface{}{"value": numReads}, timestamp)
-			if err == nil {
-				output <- y
-			}
-
-			// number of writes
-			numWrites, err := strconv.ParseInt(key_value["_wc_"], 10, 64)
-			if err != nil {
-				fmt.Fprintf(os.Stderr, "GpfsCollector.Read(): Failed to convert number of writes: %s\n", err.Error())
-				continue
-			}
-			y, err = lp.New("gpfs_num_writes", m.tags, m.meta, map[string]interface{}{"value": numWrites}, timestamp)
-			if err == nil {
-				output <- y
-			}
-
-			// number of read directories
-			numReaddirs, err := strconv.ParseInt(key_value["_dir_"], 10, 64)
-			if err != nil {
-				fmt.Fprintf(os.Stderr, "GpfsCollector.Read(): Failed to convert number of read directories: %s\n", err.Error())
-				continue
-			}
-			y, err = lp.New("gpfs_num_readdirs", m.tags, m.meta, map[string]interface{}{"value": numReaddirs}, timestamp)
-			if err == nil {
-				output <- y
-			}
-
-			// Number of inode updates
-			numInodeUpdates, err := strconv.ParseInt(key_value["_iu_"], 10, 64)
-			if err != nil {
-				fmt.Fprintf(os.Stderr, "GpfsCollector.Read(): Failed to convert Number of inode updates: %s\n", err.Error())
-				continue
-			}
-			y, err = lp.New("gpfs_num_inode_updates", m.tags, m.meta, map[string]interface{}{"value": numInodeUpdates}, timestamp)
-			if err == nil {
+			metaops := numInodeUpdates + numCloses + numOpens + numReaddirs
+			if y, err :=
+				lp.New("gpfs_metaops",
+					m.tags,
+					m.meta,
+					map[string]interface{}{
+						"value": metaops,
+					},
+					timestamp,
+				); err == nil {
 				output <- y
 			}
 		}
--- a/collectors/gpfsMetric.md
+++ b/collectors/gpfsMetric.md
@@ -0,0 +1,39 @@
+## `gpfs` collector
+
+```json
+  "ibstat": {
+    "mmpmon_path": "/path/to/mmpmon",
+    "exclude_filesystem": [
+      "fs1"
+    ],
+    "send_bandwidths": true,
+    "send_total_values": true
+  }
+```
+
+The `gpfs` collector uses the `mmpmon` command to read performance metrics for
+GPFS / IBM Spectrum Scale filesystems.
+
+The reported filesystems can be filtered with the `exclude_filesystem` option
+in the configuration.
+
+The path to the `mmpmon` command can be configured with the `mmpmon_path` option
+in the configuration. If nothing is set, the collector searches in `$PATH` for `mmpmon`.
+
+
+Metrics:
+* `gpfs_bytes_read`
+* `gpfs_bytes_written`
+* `gpfs_num_opens`
+* `gpfs_num_closes`
+* `gpfs_num_reads`
+* `gpfs_num_writes`
+* `gpfs_num_readdirs`
+* `gpfs_num_inode_updates`
+* `gpfs_bytes_total = gpfs_bytes_read + gpfs_bytes_written` (if `send_total_values == true`)
+* `gpfs_iops = gpfs_num_reads + gpfs_num_writes` (if `send_total_values == true`)
+* `gpfs_metaops = gpfs_num_inode_updates + gpfs_num_closes + gpfs_num_opens + gpfs_num_readdirs` (if `send_total_values == true`)
+* `gpfs_bw_read` (if `send_bandwidths == true`)
+* `gpfs_bw_write` (if `send_bandwidths == true`)
+
+The collector adds a `filesystem` tag to all metrics
--- a/collectors/infinibandMetric.go
+++ b/collectors/infinibandMetric.go
@@ -4,7 +4,8 @@ import (
 	"fmt"
 	"os"

-	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
+	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
 	"golang.org/x/sys/unix"

 	"encoding/json"
@@ -14,51 +15,60 @@ import (
 	"time"
 )

-const IB_BASEPATH = `/sys/class/infiniband/`
+const IB_BASEPATH = "/sys/class/infiniband/"
+
+type InfinibandCollectorMetric struct {
+	name             string
+	path             string
+	unit             string
+	scale            int64
+	addToIBTotal     bool
+	addToIBTotalPkgs bool
+	currentState     int64
+	lastState        int64
+}

 type InfinibandCollectorInfo struct {
-	LID              string            // IB local Identifier (LID)
-	device           string            // IB device
-	port             string            // IB device port
-	portCounterFiles map[string]string // mapping counter name -> file
-	tagSet           map[string]string // corresponding tag list
+	LID              string                      // IB local Identifier (LID)
+	device           string                      // IB device
+	port             string                      // IB device port
+	portCounterFiles []InfinibandCollectorMetric // mapping counter name -> InfinibandCollectorMetric
+	tagSet           map[string]string           // corresponding tag list
 }

 type InfinibandCollector struct {
 	metricCollector
 	config struct {
-		ExcludeDevices []string `json:"exclude_devices,omitempty"` // IB device to exclude e.g. mlx5_0
+		ExcludeDevices     []string `json:"exclude_devices,omitempty"` // IB device to exclude e.g. mlx5_0
+		SendAbsoluteValues bool     `json:"send_abs_values"`           // Send absolut values as read from sys filesystem
+		SendTotalValues    bool     `json:"send_total_values"`         // Send computed total values
+		SendDerivedValues  bool     `json:"send_derived_values"`       // Send derived values e.g. rates
 	}
-	info []InfinibandCollectorInfo
-}
-
-func (m *InfinibandCollector) Help() {
-	fmt.Println("This collector includes all devices that can be found below ", IB_BASEPATH)
-	fmt.Println("and where any of the ports provides a 'lid' file (glob ", IB_BASEPATH, "/<dev>/ports/<port>/lid).")
-	fmt.Println("The devices can be filtered with the 'exclude_devices' option in the configuration.")
-	fmt.Println("For each found LIDs the collector calls the 'perfquery' command")
-	fmt.Println("")
-	fmt.Println("Full configuration object:")
-	fmt.Println("\"ibstat\" : {")
-	fmt.Println("  \"exclude_devices\" : [\"dev1\"]")
-	fmt.Println("}")
-	fmt.Println("")
-	fmt.Println("Metrics:")
-	fmt.Println("- ib_recv")
-	fmt.Println("- ib_xmit")
-	fmt.Println("- ib_recv_pkts")
-	fmt.Println("- ib_xmit_pkts")
+	info          []InfinibandCollectorInfo
+	lastTimestamp time.Time // Store time stamp of last tick to derive bandwidths
 }

 // Init initializes the Infiniband collector by walking through files below IB_BASEPATH
 func (m *InfinibandCollector) Init(config json.RawMessage) error {
+
+	// Check if already initialized
+	if m.init {
+		return nil
+	}
+
 	var err error
 	m.name = "InfinibandCollector"
 	m.setup()
+	m.parallel = true
 	m.meta = map[string]string{
 		"source": m.name,
 		"group":  "Network",
 	}
+
+	// Set default configuration,
+	m.config.SendAbsoluteValues = true
+	m.config.SendDerivedValues = false
+	// Read configuration file, allow overwriting default config
 	if len(config) > 0 {
 		err = json.Unmarshal(config, &m.config)
 		if err != nil {
@@ -70,17 +80,21 @@ func (m *InfinibandCollector) Init(config json.RawMessage) error {
 	globPattern := filepath.Join(IB_BASEPATH, "*", "ports", "*")
 	ibDirs, err := filepath.Glob(globPattern)
 	if err != nil {
-		return fmt.Errorf("Unable to glob files with pattern %s: %v", globPattern, err)
+		return fmt.Errorf("unable to glob files with pattern %s: %v", globPattern, err)
 	}
 	if ibDirs == nil {
-		return fmt.Errorf("Unable to find any directories with pattern %s", globPattern)
+		return fmt.Errorf("unable to find any directories with pattern %s", globPattern)
 	}

 	for _, path := range ibDirs {

 		// Skip, when no LID is assigned
-		LID, ok := readOneLine(path + "/lid")
-		if !ok || LID == "0x0" {
+		line, err := os.ReadFile(filepath.Join(path, "lid"))
+		if err != nil {
+			continue
+		}
+		LID := strings.TrimSpace(string(line))
+		if LID == "0x0" {
 			continue
 		}

@@ -103,16 +117,44 @@ func (m *InfinibandCollector) Init(config json.RawMessage) error {

 		// Check access to counter files
 		countersDir := filepath.Join(path, "counters")
-		portCounterFiles := map[string]string{
-			"ib_recv":      filepath.Join(countersDir, "port_rcv_data"),
-			"ib_xmit":      filepath.Join(countersDir, "port_xmit_data"),
-			"ib_recv_pkts": filepath.Join(countersDir, "port_rcv_packets"),
-			"ib_xmit_pkts": filepath.Join(countersDir, "port_xmit_packets"),
+		portCounterFiles := []InfinibandCollectorMetric{
+			{
+				name:         "ib_recv",
+				path:         filepath.Join(countersDir, "port_rcv_data"),
+				unit:         "bytes",
+				scale:        4,
+				addToIBTotal: true,
+				lastState:    -1,
+			},
+			{
+				name:         "ib_xmit",
+				path:         filepath.Join(countersDir, "port_xmit_data"),
+				unit:         "bytes",
+				scale:        4,
+				addToIBTotal: true,
+				lastState:    -1,
+			},
+			{
+				name:             "ib_recv_pkts",
+				path:             filepath.Join(countersDir, "port_rcv_packets"),
+				unit:             "packets",
+				scale:            1,
+				addToIBTotalPkgs: true,
+				lastState:        -1,
+			},
+			{
+				name:             "ib_xmit_pkts",
+				path:             filepath.Join(countersDir, "port_xmit_packets"),
+				unit:             "packets",
+				scale:            1,
+				addToIBTotalPkgs: true,
+				lastState:        -1,
+			},
 		}
-		for _, counterFile := range portCounterFiles {
-			err := unix.Access(counterFile, unix.R_OK)
+		for _, counter := range portCounterFiles {
+			err := unix.Access(counter.path, unix.R_OK)
 			if err != nil {
-				return fmt.Errorf("Unable to access %s: %v", counterFile, err)
+				return fmt.Errorf("unable to access %s: %v", counter.path, err)
 			}
 		}

@@ -132,7 +174,7 @@ func (m *InfinibandCollector) Init(config json.RawMessage) error {
 	}

 	if len(m.info) == 0 {
-		return fmt.Errorf("Found no IB devices")
+		return fmt.Errorf("found no IB devices")
 	}

 	m.init = true
@@ -147,18 +189,118 @@ func (m *InfinibandCollector) Read(interval time.Duration, output chan lp.CCMetr
 		return
 	}

+	// Current time stamp
 	now := time.Now()
-	for i := range m.info {
+	// time difference to last time stamp
+	timeDiff := now.Sub(m.lastTimestamp).Seconds()
+	// Save current timestamp
+	m.lastTimestamp = now

-		// device info
+	for i := range m.info {
 		info := &m.info[i]
-		for counterName, counterFile := range info.portCounterFiles {
-			if data, ok := readOneLine(counterFile); ok {
-				if v, err := strconv.ParseInt(data, 10, 64); err == nil {
-					if y, err := lp.New(counterName, info.tagSet, m.meta, map[string]interface{}{"value": v}, now); err == nil {
+
+		var ib_total, ib_total_pkts int64
+		for i := range info.portCounterFiles {
+			counterDef := &info.portCounterFiles[i]
+
+			// Read counter file
+			line, err := os.ReadFile(counterDef.path)
+			if err != nil {
+				cclog.ComponentError(
+					m.name,
+					fmt.Sprintf("Read(): Failed to read from file '%s': %v", counterDef.path, err))
+				continue
+			}
+			data := strings.TrimSpace(string(line))
+
+			// convert counter to int64
+			v, err := strconv.ParseInt(data, 10, 64)
+			if err != nil {
+				cclog.ComponentError(
+					m.name,
+					fmt.Sprintf("Read(): Failed to convert Infininiband metrice %s='%s' to int64: %v", counterDef.name, data, err))
+				continue
+			}
+			// Scale raw value
+			v *= counterDef.scale
+
+			// Save current state
+			counterDef.currentState = v
+
+			// Send absolut values
+			if m.config.SendAbsoluteValues {
+				if y, err :=
+					lp.New(
+						counterDef.name,
+						info.tagSet,
+						m.meta,
+						map[string]interface{}{
+							"value": counterDef.currentState,
+						},
+						now); err == nil {
+					y.AddMeta("unit", counterDef.unit)
+					output <- y
+				}
+			}
+
+			// Send derived values
+			if m.config.SendDerivedValues {
+				if counterDef.lastState >= 0 {
+					rate := float64((counterDef.currentState - counterDef.lastState)) / timeDiff
+					if y, err :=
+						lp.New(
+							counterDef.name+"_bw",
+							info.tagSet,
+							m.meta,
+							map[string]interface{}{
+								"value": rate,
+							},
+							now); err == nil {
+						y.AddMeta("unit", counterDef.unit+"/sec")
 						output <- y
+
 					}
 				}
+				counterDef.lastState = counterDef.currentState
+			}
+
+			// Sum up total values
+			if m.config.SendTotalValues {
+				switch {
+				case counterDef.addToIBTotal:
+					ib_total += counterDef.currentState
+				case counterDef.addToIBTotalPkgs:
+					ib_total_pkts += counterDef.currentState
+				}
+			}
+		}
+
+		// Send total values
+		if m.config.SendTotalValues {
+			if y, err :=
+				lp.New(
+					"ib_total",
+					info.tagSet,
+					m.meta,
+					map[string]interface{}{
+						"value": ib_total,
+					},
+					now); err == nil {
+				y.AddMeta("unit", "bytes")
+				output <- y
+			}
+
+			if y, err :=
+				lp.New(
+					"ib_total_pkts",
+					info.tagSet,
+					m.meta,
+					map[string]interface{}{
+						"value": ib_total_pkts,
+					},
+					now); err == nil {
+				y.AddMeta("unit", "packets")
+				output <- y
 			}
 		}
 	}
--- a/collectors/infinibandMetric.md
+++ b/collectors/infinibandMetric.md
@@ -3,17 +3,33 @@

 ```json
  "ibstat": {
-    "perfquery_path" : "<path to perfquery command>",
    "exclude_devices": [
      "mlx4"
-    ]
+    ],
+    "send_abs_values": true,
+    "send_derived_values": true
  }
 ```

-The `ibstat` collector reads either data through the `perfquery` command or the sysfs files below `/sys/class/infiniband/<device>`.
+The `ibstat` collector includes all Infiniband devices that can be
+found below `/sys/class/infiniband/` and where any of the ports provides a
+LID file (`/sys/class/infiniband/<dev>/ports/<port>/lid`)
+
+The devices can be filtered with the `exclude_devices` option in the configuration.
+
+For each found LID the collector reads data through the sysfs files below `/sys/class/infiniband/<device>`. (See: <https://www.kernel.org/doc/Documentation/ABI/stable/sysfs-class-infiniband>)

 Metrics:
+
 * `ib_recv`
 * `ib_xmit`
+* `ib_recv_pkts`
+* `ib_xmit_pkts`
+* `ib_total = ib_recv + ib_xmit` (if `send_total_values == true`)
+* `ib_total_pkts = ib_recv_pkts + ib_xmit_pkts` (if `send_total_values == true`)
+* `ib_recv_bw` (if `send_derived_values == true`)
+* `ib_xmit_bw` (if `send_derived_values == true`)
+* `ib_recv_pkts_bw` (if `send_derived_values == true`)
+* `ib_xmit_pkts_bw` (if `send_derived_values == true`)

 The collector adds a `device` tag to all metrics
--- a/collectors/infinibandPerfQueryMetric.go
+++ b/collectors/infinibandPerfQueryMetric.go
@@ -1,250 +0,0 @@
-package collectors
-
-import (
-	"fmt"
-	"io/ioutil"
-	"log"
-	"os/exec"
-
-	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
-
-	//	"os"
-	"encoding/json"
-	"errors"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"time"
-)
-
-const PERFQUERY = `/usr/sbin/perfquery`
-
-type InfinibandPerfQueryCollector struct {
-	metricCollector
-	tags   map[string]string
-	lids   map[string]map[string]string
-	config struct {
-		ExcludeDevices []string `json:"exclude_devices,omitempty"`
-		PerfQueryPath  string   `json:"perfquery_path"`
-	}
-}
-
-func (m *InfinibandPerfQueryCollector) Help() {
-	fmt.Println("This collector includes all devices that can be found below ", IB_BASEPATH)
-	fmt.Println("and where any of the ports provides a 'lid' file (glob ", IB_BASEPATH, "/<dev>/ports/<port>/lid).")
-	fmt.Println("The devices can be filtered with the 'exclude_devices' option in the configuration.")
-	fmt.Println("For each found LIDs the collector calls the 'perfquery' command")
-	fmt.Println("The path to the 'perfquery' command can be configured with the 'perfquery_path' option")
-	fmt.Println("in the configuration")
-	fmt.Println("")
-	fmt.Println("Full configuration object:")
-	fmt.Println("\"ibstat\" : {")
-	fmt.Println("  \"perfquery_path\" : \"path/to/perfquery\"  # if omitted, it searches in $PATH")
-	fmt.Println("  \"exclude_devices\" : [\"dev1\"]")
-	fmt.Println("}")
-	fmt.Println("")
-	fmt.Println("Metrics:")
-	fmt.Println("- ib_recv")
-	fmt.Println("- ib_xmit")
-	fmt.Println("- ib_recv_pkts")
-	fmt.Println("- ib_xmit_pkts")
-}
-
-func (m *InfinibandPerfQueryCollector) Init(config json.RawMessage) error {
-	var err error
-	m.name = "InfinibandCollectorPerfQuery"
-	m.setup()
-	m.meta = map[string]string{"source": m.name, "group": "Network"}
-	m.tags = map[string]string{"type": "node"}
-	if len(config) > 0 {
-		err = json.Unmarshal(config, &m.config)
-		if err != nil {
-			return err
-		}
-	}
-	if len(m.config.PerfQueryPath) == 0 {
-		path, err := exec.LookPath("perfquery")
-		if err == nil {
-			m.config.PerfQueryPath = path
-		}
-	}
-	m.lids = make(map[string]map[string]string)
-	p := fmt.Sprintf("%s/*/ports/*/lid", string(IB_BASEPATH))
-	files, err := filepath.Glob(p)
-	for _, f := range files {
-		lid, err := ioutil.ReadFile(f)
-		if err == nil {
-			plist := strings.Split(strings.Replace(f, string(IB_BASEPATH), "", -1), "/")
-			skip := false
-			for _, d := range m.config.ExcludeDevices {
-				if d == plist[0] {
-					skip = true
-				}
-			}
-			if !skip {
-				m.lids[plist[0]] = make(map[string]string)
-				m.lids[plist[0]][plist[2]] = string(lid)
-			}
-		}
-	}
-
-	for _, ports := range m.lids {
-		for port, lid := range ports {
-			args := fmt.Sprintf("-r %s %s 0xf000", lid, port)
-			command := exec.Command(m.config.PerfQueryPath, args)
-			command.Wait()
-			_, err := command.Output()
-			if err != nil {
-				return fmt.Errorf("Failed to execute %s: %v", m.config.PerfQueryPath, err)
-			}
-		}
-	}
-
-	if len(m.lids) == 0 {
-		return errors.New("No usable IB devices")
-	}
-
-	m.init = true
-	return nil
-}
-
-func (m *InfinibandPerfQueryCollector) doPerfQuery(cmd string, dev string, lid string, port string, tags map[string]string, output chan lp.CCMetric) error {
-
-	args := fmt.Sprintf("-r %s %s 0xf000", lid, port)
-	command := exec.Command(cmd, args)
-	command.Wait()
-	stdout, err := command.Output()
-	if err != nil {
-		log.Print(err)
-		return err
-	}
-	ll := strings.Split(string(stdout), "\n")
-
-	for _, line := range ll {
-		if strings.HasPrefix(line, "PortRcvData") || strings.HasPrefix(line, "RcvData") {
-			lv := strings.Fields(line)
-			v, err := strconv.ParseFloat(lv[1], 64)
-			if err == nil {
-				y, err := lp.New("ib_recv", tags, m.meta, map[string]interface{}{"value": float64(v)}, time.Now())
-				if err == nil {
-					output <- y
-				}
-			}
-		}
-		if strings.HasPrefix(line, "PortXmitData") || strings.HasPrefix(line, "XmtData") {
-			lv := strings.Fields(line)
-			v, err := strconv.ParseFloat(lv[1], 64)
-			if err == nil {
-				y, err := lp.New("ib_xmit", tags, m.meta, map[string]interface{}{"value": float64(v)}, time.Now())
-				if err == nil {
-					output <- y
-				}
-			}
-		}
-		if strings.HasPrefix(line, "PortRcvPkts") || strings.HasPrefix(line, "RcvPkts") {
-			lv := strings.Fields(line)
-			v, err := strconv.ParseFloat(lv[1], 64)
-			if err == nil {
-				y, err := lp.New("ib_recv_pkts", tags, m.meta, map[string]interface{}{"value": float64(v)}, time.Now())
-				if err == nil {
-					output <- y
-				}
-			}
-		}
-		if strings.HasPrefix(line, "PortXmitPkts") || strings.HasPrefix(line, "XmtPkts") {
-			lv := strings.Fields(line)
-			v, err := strconv.ParseFloat(lv[1], 64)
-			if err == nil {
-				y, err := lp.New("ib_xmit_pkts", tags, m.meta, map[string]interface{}{"value": float64(v)}, time.Now())
-				if err == nil {
-					output <- y
-				}
-			}
-		}
-		if strings.HasPrefix(line, "PortRcvPkts") || strings.HasPrefix(line, "RcvPkts") {
-			lv := strings.Fields(line)
-			v, err := strconv.ParseFloat(lv[1], 64)
-			if err == nil {
-				y, err := lp.New("ib_recv_pkts", tags, m.meta, map[string]interface{}{"value": float64(v)}, time.Now())
-				if err == nil {
-					output <- y
-				}
-			}
-		}
-		if strings.HasPrefix(line, "PortXmitPkts") || strings.HasPrefix(line, "XmtPkts") {
-			lv := strings.Fields(line)
-			v, err := strconv.ParseFloat(lv[1], 64)
-			if err == nil {
-				y, err := lp.New("ib_xmit_pkts", tags, m.meta, map[string]interface{}{"value": float64(v)}, time.Now())
-				if err == nil {
-					output <- y
-				}
-			}
-		}
-	}
-	return nil
-}
-
-func (m *InfinibandPerfQueryCollector) Read(interval time.Duration, output chan lp.CCMetric) {
-
-	if m.init {
-		for dev, ports := range m.lids {
-			for port, lid := range ports {
-				tags := map[string]string{
-					"type":   "node",
-					"device": dev,
-					"port":   port,
-					"lid":    lid}
-				path := fmt.Sprintf("%s/%s/ports/%s/counters/", string(IB_BASEPATH), dev, port)
-				buffer, err := ioutil.ReadFile(fmt.Sprintf("%s/port_rcv_data", path))
-				if err == nil {
-					data := strings.Replace(string(buffer), "\n", "", -1)
-					v, err := strconv.ParseFloat(data, 64)
-					if err == nil {
-						y, err := lp.New("ib_recv", tags, m.meta, map[string]interface{}{"value": float64(v)}, time.Now())
-						if err == nil {
-							output <- y
-						}
-					}
-				}
-				buffer, err = ioutil.ReadFile(fmt.Sprintf("%s/port_xmit_data", path))
-				if err == nil {
-					data := strings.Replace(string(buffer), "\n", "", -1)
-					v, err := strconv.ParseFloat(data, 64)
-					if err == nil {
-						y, err := lp.New("ib_xmit", tags, m.meta, map[string]interface{}{"value": float64(v)}, time.Now())
-						if err == nil {
-							output <- y
-						}
-					}
-				}
-				buffer, err = ioutil.ReadFile(fmt.Sprintf("%s/port_rcv_packets", path))
-				if err == nil {
-					data := strings.Replace(string(buffer), "\n", "", -1)
-					v, err := strconv.ParseFloat(data, 64)
-					if err == nil {
-						y, err := lp.New("ib_recv_pkts", tags, m.meta, map[string]interface{}{"value": float64(v)}, time.Now())
-						if err == nil {
-							output <- y
-						}
-					}
-				}
-				buffer, err = ioutil.ReadFile(fmt.Sprintf("%s/port_xmit_packets", path))
-				if err == nil {
-					data := strings.Replace(string(buffer), "\n", "", -1)
-					v, err := strconv.ParseFloat(data, 64)
-					if err == nil {
-						y, err := lp.New("ib_xmit_pkts", tags, m.meta, map[string]interface{}{"value": float64(v)}, time.Now())
-						if err == nil {
-							output <- y
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
-func (m *InfinibandPerfQueryCollector) Close() {
-	m.init = false
-}
--- a/collectors/iostatMetric.go
+++ b/collectors/iostatMetric.go
@@ -0,0 +1,156 @@
+package collectors
+
+import (
+	"bufio"
+	"os"
+
+	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
+
+	//	"log"
+	"encoding/json"
+	"errors"
+	"strconv"
+	"strings"
+	"time"
+)
+
+const IOSTATFILE = `/proc/diskstats`
+const IOSTAT_SYSFSPATH = `/sys/block`
+
+type IOstatCollectorConfig struct {
+	ExcludeMetrics []string `json:"exclude_metrics,omitempty"`
+}
+
+type IOstatCollectorEntry struct {
+	lastValues map[string]int64
+	tags       map[string]string
+}
+
+type IOstatCollector struct {
+	metricCollector
+	matches map[string]int
+	config  IOstatCollectorConfig
+	devices map[string]IOstatCollectorEntry
+}
+
+func (m *IOstatCollector) Init(config json.RawMessage) error {
+	var err error
+	m.name = "IOstatCollector"
+	m.parallel = true
+	m.meta = map[string]string{"source": m.name, "group": "Disk"}
+	m.setup()
+	if len(config) > 0 {
+		err = json.Unmarshal(config, &m.config)
+		if err != nil {
+			return err
+		}
+	}
+	// https://www.kernel.org/doc/html/latest/admin-guide/iostats.html
+	matches := map[string]int{
+		"io_reads":             3,
+		"io_reads_merged":      4,
+		"io_read_sectors":      5,
+		"io_read_ms":           6,
+		"io_writes":            7,
+		"io_writes_merged":     8,
+		"io_writes_sectors":    9,
+		"io_writes_ms":         10,
+		"io_ioops":             11,
+		"io_ioops_ms":          12,
+		"io_ioops_weighted_ms": 13,
+		"io_discards":          14,
+		"io_discards_merged":   15,
+		"io_discards_sectors":  16,
+		"io_discards_ms":       17,
+		"io_flushes":           18,
+		"io_flushes_ms":        19,
+	}
+	m.devices = make(map[string]IOstatCollectorEntry)
+	m.matches = make(map[string]int)
+	for k, v := range matches {
+		if _, skip := stringArrayContains(m.config.ExcludeMetrics, k); !skip {
+			m.matches[k] = v
+		}
+	}
+	if len(m.matches) == 0 {
+		return errors.New("no metrics to collect")
+	}
+	file, err := os.Open(string(IOSTATFILE))
+	if err != nil {
+		cclog.ComponentError(m.name, err.Error())
+		return err
+	}
+	defer file.Close()
+
+	scanner := bufio.NewScanner(file)
+	for scanner.Scan() {
+		line := scanner.Text()
+		linefields := strings.Fields(line)
+		device := linefields[2]
+		if strings.Contains(device, "loop") {
+			continue
+		}
+		values := make(map[string]int64)
+		for m := range m.matches {
+			values[m] = 0
+		}
+		m.devices[device] = IOstatCollectorEntry{
+			tags: map[string]string{
+				"device": linefields[2],
+				"type":   "node",
+			},
+			lastValues: values,
+		}
+	}
+	m.init = true
+	return err
+}
+
+func (m *IOstatCollector) Read(interval time.Duration, output chan lp.CCMetric) {
+	if !m.init {
+		return
+	}
+
+	file, err := os.Open(string(IOSTATFILE))
+	if err != nil {
+		cclog.ComponentError(m.name, err.Error())
+		return
+	}
+	defer file.Close()
+
+	scanner := bufio.NewScanner(file)
+	for scanner.Scan() {
+		line := scanner.Text()
+		if len(line) == 0 {
+			continue
+		}
+		linefields := strings.Fields(line)
+		device := linefields[2]
+		if strings.Contains(device, "loop") {
+			continue
+		}
+		if _, ok := m.devices[device]; !ok {
+			continue
+		}
+		entry := m.devices[device]
+		for name, idx := range m.matches {
+			if idx < len(linefields) {
+				x, err := strconv.ParseInt(linefields[idx], 0, 64)
+				if err == nil {
+					diff := x - entry.lastValues[name]
+					y, err := lp.New(name, entry.tags, m.meta, map[string]interface{}{"value": int(diff)}, time.Now())
+					if err == nil {
+						output <- y
+					}
+				}
+				entry.lastValues[name] = x
+			}
+		}
+		m.devices[device] = entry
+	}
+}
+
+func (m *IOstatCollector) Close() {
+	m.init = false
+}
--- a/collectors/iostatMetric.md
+++ b/collectors/iostatMetric.md
@@ -0,0 +1,34 @@
+
+## `iostat` collector
+
+```json
+  "iostat": {
+    "exclude_metrics": [
+      "read_ms"
+    ],
+  }
+```
+
+The `iostat` collector reads data from `/proc/diskstats` and outputs a handful **node** metrics. If a metric is not required, it can be excluded from forwarding it to the sink.
+
+Metrics:
+* `io_reads`
+* `io_reads_merged`
+* `io_read_sectors`
+* `io_read_ms`
+* `io_writes`
+* `io_writes_merged`
+* `io_writes_sectors`
+* `io_writes_ms`
+* `io_ioops`
+* `io_ioops_ms`
+* `io_ioops_weighted_ms`
+* `io_discards`
+* `io_discards_merged`
+* `io_discards_sectors`
+* `io_discards_ms`
+* `io_flushes`
+* `io_flushes_ms`
+
+The device name is added as tag `device`. For more details, see https://www.kernel.org/doc/html/latest/admin-guide/iostats.html
+
--- a/collectors/ipmiMetric.go
+++ b/collectors/ipmiMetric.go
@@ -1,78 +1,100 @@
 package collectors

 import (
+	"bufio"
+	"bytes"
 	"encoding/json"
 	"errors"
+	"fmt"
+	"io"
 	"log"
-	"os"
 	"os/exec"
 	"strconv"
 	"strings"
 	"time"
-	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
+	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
 )

-const IPMITOOL_PATH = `/usr/bin/ipmitool`
-const IPMISENSORS_PATH = `/usr/sbin/ipmi-sensors`
-
-type IpmiCollectorConfig struct {
-	ExcludeDevices  []string `json:"exclude_devices"`
-	IpmitoolPath    string   `json:"ipmitool_path"`
-	IpmisensorsPath string   `json:"ipmisensors_path"`
-}
+const IPMISENSORS_PATH = `ipmi-sensors`

 type IpmiCollector struct {
 	metricCollector
-	tags    map[string]string
-	matches map[string]string
-	config  IpmiCollectorConfig
+	config struct {
+		ExcludeDevices  []string `json:"exclude_devices"`
+		IpmitoolPath    string   `json:"ipmitool_path"`
+		IpmisensorsPath string   `json:"ipmisensors_path"`
+	}
+	ipmitool    string
+	ipmisensors string
 }

 func (m *IpmiCollector) Init(config json.RawMessage) error {
+	// Check if already initialized
+	if m.init {
+		return nil
+	}
+
 	m.name = "IpmiCollector"
 	m.setup()
-	m.meta = map[string]string{"source": m.name, "group": "IPMI"}
+	m.parallel = true
+	m.meta = map[string]string{
+		"source": m.name,
+		"group":  "IPMI",
+	}
+	// default path to IPMI tools
+	m.config.IpmitoolPath = "ipmitool"
+	m.config.IpmisensorsPath = "ipmi-sensors"
 	if len(config) > 0 {
 		err := json.Unmarshal(config, &m.config)
 		if err != nil {
 			return err
 		}
 	}
-	_, err1 := os.Stat(m.config.IpmitoolPath)
-	_, err2 := os.Stat(m.config.IpmisensorsPath)
-	if err1 != nil {
-		m.config.IpmitoolPath = ""
+	// Check if executables ipmitool or ipmisensors are found
+	p, err := exec.LookPath(m.config.IpmitoolPath)
+	if err == nil {
+		m.ipmitool = p
 	}
-	if err2 != nil {
-		m.config.IpmisensorsPath = ""
+	p, err = exec.LookPath(m.config.IpmisensorsPath)
+	if err == nil {
+		m.ipmisensors = p
 	}
-	if err1 != nil && err2 != nil {
-		return errors.New("No IPMI reader found")
+	if len(m.ipmitool) == 0 && len(m.ipmisensors) == 0 {
+		return errors.New("no IPMI reader found")
 	}
 	m.init = true
 	return nil
 }

 func (m *IpmiCollector) readIpmiTool(cmd string, output chan lp.CCMetric) {
+
+	// Setup ipmitool command
 	command := exec.Command(cmd, "sensor")
-	command.Wait()
-	stdout, err := command.Output()
-	if err != nil {
-		log.Print(err)
+	stdout, _ := command.StdoutPipe()
+	errBuf := new(bytes.Buffer)
+	command.Stderr = errBuf
+
+	// start command
+	if err := command.Start(); err != nil {
+		cclog.ComponentError(
+			m.name,
+			fmt.Sprintf("readIpmiTool(): Failed to start command \"%s\": %v", command.String(), err),
+		)
 		return
 	}

-	ll := strings.Split(string(stdout), "\n")
-
-	for _, line := range ll {
-		lv := strings.Split(line, "|")
+	// Read command output
+	scanner := bufio.NewScanner(stdout)
+	for scanner.Scan() {
+		lv := strings.Split(scanner.Text(), "|")
 		if len(lv) < 3 {
 			continue
 		}
-		v, err := strconv.ParseFloat(strings.Trim(lv[1], " "), 64)
+		v, err := strconv.ParseFloat(strings.TrimSpace(lv[1]), 64)
 		if err == nil {
-			name := strings.ToLower(strings.Replace(strings.Trim(lv[0], " "), " ", "_", -1))
-			unit := strings.Trim(lv[2], " ")
+			name := strings.ToLower(strings.Replace(strings.TrimSpace(lv[0]), " ", "_", -1))
+			unit := strings.TrimSpace(lv[2])
 			if unit == "Volts" {
 				unit = "Volts"
 			} else if unit == "degrees C" {
@@ -90,6 +112,17 @@ func (m *IpmiCollector) readIpmiTool(cmd string, output chan lp.CCMetric) {
 			}
 		}
 	}
+
+	// Wait for command end
+	if err := command.Wait(); err != nil {
+		errMsg, _ := io.ReadAll(errBuf)
+		cclog.ComponentError(
+			m.name,
+			fmt.Sprintf("readIpmiTool(): Failed to wait for the end of command \"%s\": %v\n", command.String(), err),
+			fmt.Sprintf("readIpmiTool(): command stderr: \"%s\"\n", string(errMsg)),
+		)
+		return
+	}
 }

 func (m *IpmiCollector) readIpmiSensors(cmd string, output chan lp.CCMetric) {
@@ -123,16 +156,16 @@ func (m *IpmiCollector) readIpmiSensors(cmd string, output chan lp.CCMetric) {
 }

 func (m *IpmiCollector) Read(interval time.Duration, output chan lp.CCMetric) {
+
+	// Check if already initialized
+	if !m.init {
+		return
+	}
+
 	if len(m.config.IpmitoolPath) > 0 {
-		_, err := os.Stat(m.config.IpmitoolPath)
-		if err == nil {
-			m.readIpmiTool(m.config.IpmitoolPath, output)
-		}
+		m.readIpmiTool(m.config.IpmitoolPath, output)
 	} else if len(m.config.IpmisensorsPath) > 0 {
-		_, err := os.Stat(m.config.IpmisensorsPath)
-		if err == nil {
-			m.readIpmiSensors(m.config.IpmisensorsPath, output)
-		}
+		m.readIpmiSensors(m.config.IpmisensorsPath, output)
 	}
 }

--- a/collectors/ipmiMetric.md
+++ b/collectors/ipmiMetric.md
@@ -8,9 +8,6 @@
  }
 ```

-The `ipmistat` collector reads data from `ipmitool` (`ipmitool sensor`) or `ipmi-sensors` (`ipmi-sensors --sdr-cache-recreate --comma-separated-output`). 
+The `ipmistat` collector reads data from `ipmitool` (`ipmitool sensor`) or `ipmi-sensors` (`ipmi-sensors --sdr-cache-recreate --comma-separated-output`).

 The metrics depend on the output of the underlying tools but contain temperature, power and energy metrics.
-
-
-
--- a/collectors/likwidMetric.go
+++ b/collectors/likwidMetric.go
--- a/collectors/likwidMetric.md
+++ b/collectors/likwidMetric.md
@@ -1,7 +1,151 @@

 ## `likwid` collector
+
+The `likwid` collector is probably the most complicated collector. The LIKWID library is included as static library with *direct* access mode. The *direct* access mode is suitable if the daemon is executed by a root user. The static library does not contain the performance groups, so all information needs to be provided in the configuration.
+
 ```json
  "likwid": {
+    "force_overwrite" : false,
+    "invalid_to_zero" : false,
+    "liblikwid_path" : "/path/to/liblikwid.so",
+    "accessdaemon_path" : "/folder/that/contains/likwid-accessD",
+    "access_mode" : "direct or accessdaemon or perf_event",
+    "lockfile_path" : "/var/run/likwid.lock",
+    "eventsets": [
+      {
+        "events" : {
+          "COUNTER0": "EVENT0",
+          "COUNTER1": "EVENT1",
+        },
+        "metrics" : [
+          {
+            "name": "sum_01",
+            "calc": "COUNTER0 + COUNTER1",
+            "publish": false,
+            "unit": "myunit",
+            "type": "hwthread"
+          }
+        ]
+      }
+    ]
+    "globalmetrics" : [
+      {
+        "name": "global_sum",
+        "calc": "sum_01",
+        "publish": true,
+        "unit": "myunit",
+        "type": "hwthread"
+      }
+    ]
+  }
+```
+
+The `likwid` configuration consists of two parts, the `eventsets` and `globalmetrics`:
+
+- An event set list itself has two parts, the `events` and a set of derivable `metrics`. Each of the `events` is a `counter:event` pair in LIKWID's syntax. The `metrics` are a list of formulas to derive the metric value from the measurements of the `events`' values. Each metric has a name, the formula, a type and a publish flag. There is an optional `unit` field. Counter names can be used like variables in the formulas, so `PMC0+PMC1` sums the measurements for the both events configured in the counters `PMC0` and `PMC1`. You can optionally use `time` for the measurement time and `inverseClock` for `1.0/baseCpuFrequency`. The type tells the LikwidCollector whether it is a metric for each hardware thread (`cpu`) or each CPU socket (`socket`). You may specify a unit for the metric with `unit`. The last one is the publishing flag. It tells the LikwidCollector whether a metric should be sent to the router or is only used internally to compute a global metric.
+- The `globalmetrics` are metrics which require data from multiple event set measurements to be derived. The inputs are the metrics in the event sets. Similar to the metrics in the event sets, the global metrics are defined by a name, a formula, a type and a publish flag. See event set metrics for details. The only difference is that there is no access to the raw event measurements anymore but only to the metrics. Also `time` and `inverseClock` cannot be used anymore. So, the idea is to derive a metric in the `eventsets` section and reuse it in the `globalmetrics` part. If you need a metric only for deriving the global metrics, disable forwarding of the event set metrics (`"publish": false`). **Be aware** that the combination might be misleading because the "behavior" of a metric changes over time and the multiple measurements might count different computing phases. Similar to the metrics in the eventset, you can specify a metric unit with the `unit` field.
+
+Additional options:
+
+- `force_overwrite`: Same as setting `LIKWID_FORCE=1`. In case counters are already in-use, LIKWID overwrites their configuration to do its measurements
+- `invalid_to_zero`: In some cases, the calculations result in `NaN` or `Inf`. With this option, all `NaN` and `Inf` values are replaces with `0.0`. See below in [seperate section](./likwidMetric.md#invalid_to_zero-option)
+- `access_mode`: Specify LIKWID access mode: `direct` for direct register access as root user or `accessdaemon`. The access mode `perf_event` is current untested.
+- `accessdaemon_path`: Folder of the accessDaemon `likwid-accessD` (like `/usr/local/sbin`)
+- `liblikwid_path`: Location of `liblikwid.so` including file name like `/usr/local/lib/liblikwid.so`
+- `lockfile_path`: Location of LIKWID's lock file if multiple tools should access the hardware counters. Default `/var/run/likwid.lock`
+
+### Available metric types
+
+Hardware performance counters are scattered all over the system nowadays. A counter coveres a specific part of the system. While there are hardware thread specific counter for CPU cycles, instructions and so on, some others are specific for a whole CPU socket/package. To address that, the LikwidCollector provides the specification of a `type` for each metric.
+
+- `hwthread` : One metric per CPU hardware thread with the tags `"type" : "hwthread"` and `"type-id" : "$hwthread_id"`
+- `socket` : One metric per CPU socket/package with the tags `"type" : "socket"` and `"type-id" : "$socket_id"`
+
+**Note:** You cannot specify `socket` type for a metric that is measured at `hwthread` type, so some kind of expert knowledge or lookup work in the [Likwid Wiki](https://github.com/RRZE-HPC/likwid/wiki) is required. Get the type of each counter from the *Architecture* pages and as soon as one counter in a metric is socket-specific, the whole metric is socket-specific.
+
+As a guideline:
+
+- All counters `FIXCx`, `PMCy` and `TMAz` have the type `hwthread`
+- All counters names containing `BOX` have the type `socket`
+- All `PWRx` counters have type `socket`, except `"PWR1" : "RAPL_CORE_ENERGY"` has `hwthread` type
+- All `DFCx` counters have type `socket`
+
+### Help with the configuration
+
+The configuration for the `likwid` collector is quite complicated. Most users don't use LIKWID with the event:counter notation but rely on the performance groups defined by the LIKWID team for each architecture. In order to help with the `likwid` collector configuration, we included a script `scripts/likwid_perfgroup_to_cc_config.py` that creates the configuration of an `eventset` from a performance group (using a LIKWID installation in `$PATH`):
+
+```
+$ likwid-perfctr -i
+[...]
+short name: ICX
+[...]
+$ likwid-perfctr -a
+[...]
+MEM_DP
+MEM
+FLOPS_SP
+CLOCK
+[...]
+$ scripts/likwid_perfgroup_to_cc_config.py ICX MEM_DP
+{
+  "events": {
+    "FIXC0": "INSTR_RETIRED_ANY",
+    "FIXC1": "CPU_CLK_UNHALTED_CORE",
+    "..." : "..."
+  },
+  "metrics" : [
+    {
+      "calc": "time",
+      "name": "Runtime (RDTSC) [s]",
+      "publish": true,
+      "unit": "seconds"
+      "type": "hwthread"
+    },
+    {
+      "..." : "..."
+    }
+  ]
+}
+```
+
+You can copy this JSON and add it to the `eventsets` list. If you specify multiple event sets, you can add globally derived metrics in the extra `global_metrics` section with the metric names as variables.
+
+### Mixed usage between daemon and users
+
+LIKWID checks the file `/var/run/likwid.lock` before performing any interfering operations. Who is allowed to access the counters is determined by the owner of the file. If it does not exist, it is created for the current user. So, if you want to temporarly allow counter access to a user (e.g. in a job):
+
+Before (SLURM prolog, ...)
+
+```bash
+chown $JOBUSER /var/run/likwid.lock
+```
+
+After (SLURM epilog, ...)
+
+```bash
+chown $CCUSER /var/run/likwid.lock
+```
+
+### `invalid_to_zero` option
+
+In some cases LIKWID returns `0.0` for some events that are further used in processing and maybe used as divisor in a calculation. After evaluation of a metric, the result might be `NaN` or `+-Inf`. These resulting metrics are commonly not created and forwarded to the router because the [InfluxDB line protocol](https://docs.influxdata.com/influxdb/cloud/reference/syntax/line-protocol/#float) does not support these special floating-point values. If you want to have them sent, this option forces these metric values to be `0.0` instead.
+
+One might think this does not happen often but often used metrics in the world of performance engineering like Instructions-per-Cycle (IPC) or more frequently the actual CPU clock are derived with events like `CPU_CLK_UNHALTED_CORE` (Intel) which do not increment in halted state (as the name implies). In there are different power management systems in a chip which can cause a hardware thread to go in such a state. Moreover, if no cycles are executed by the core, also many other events are not incremented as well (like `INSTR_RETIRED_ANY` for retired instructions and part of IPC).
+
+### `send_*_total values` option
+
+- `send_core_total_values`: Metrics, which are usually collected on a per hardware thread basis, are additionally summed up per CPU core.
+- `send_socket_total_values` Metrics, which are usually collected on a per hardware thread basis, are additionally summed up per CPU socket.
+- `send_node_total_values` Metrics, which are usually collected on a per hardware thread basis, are additionally summed up per node.
+
+### Example configuration
+
+#### AMD Zen3
+
+```json
+  "likwid": {
+    "force_overwrite" : false,
+    "invalid_to_zero" : false,
    "eventsets": [
      {
        "events": {
@@ -20,25 +164,28 @@
          {
            "name": "ipc",
            "calc": "PMC0/PMC1",
-            "socket_scope": false,
+            "type": "hwthread",
            "publish": true
          },
          {
            "name": "flops_any",
            "calc": "0.000001*PMC2/time",
-            "socket_scope": false,
+            "unit": "MFlops/s",
+            "type": "hwthread",
            "publish": true
          },
          {
-            "name": "clock_mhz",
+            "name": "clock",
            "calc": "0.000001*(FIXC1/FIXC2)/inverseClock",
-            "socket_scope": false,
+            "type": "hwthread",
+            "unit": "MHz",
            "publish": true
          },
          {
            "name": "mem1",
            "calc": "0.000001*(DFC0+DFC1+DFC2+DFC3)*64.0/time",
-            "socket_scope": true,
+            "unit": "Mbyte/s",
+            "type": "socket",
            "publish": false
          }
        ]
@@ -56,19 +203,22 @@
          {
            "name": "pwr_core",
            "calc": "PWR0/time",
-            "socket_scope": false,
+            "unit": "Watt"
+            "type": "socket",
            "publish": true
          },
          {
            "name": "pwr_pkg",
            "calc": "PWR1/time",
-            "socket_scope": true,
+            "type": "socket",
+            "unit": "Watt"
            "publish": true
          },
          {
            "name": "mem2",
            "calc": "0.000001*(DFC0+DFC1+DFC2+DFC3)*64.0/time",
-            "socket_scope": true,
+            "unit": "Mbyte/s",
+            "type": "socket",
            "publish": false
          }
        ]
@@ -78,18 +228,20 @@
      {
        "name": "mem_bw",
        "calc": "mem1+mem2",
-        "socket_scope": true,
+        "type": "socket",
+        "unit": "Mbyte/s",
        "publish": true
      }
    ]
  }
 ```

-_Example config suitable for AMD Zen3_
+### How to get the eventsets and metrics from LIKWID

 The `likwid` collector reads hardware performance counters at a **hwthread** and **socket** level. The configuration looks quite complicated but it is basically copy&paste from [LIKWID's performance groups](https://github.com/RRZE-HPC/likwid/tree/master/groups). The collector made multiple iterations and tried to use the performance groups but it lacked flexibility. The current way of configuration provides most flexibility.

 The logic is as following: There are multiple eventsets, each consisting of a list of counters+events and a list of metrics. If you compare a common performance group with the example setting above, there is not much difference:
+
 ```
 EVENTSET                         ->   "events": {
 FIXC1 ACTUAL_CPU_CLOCK           ->     "FIXC1": "ACTUAL_CPU_CLOCK",
@@ -108,12 +260,10 @@ METRICS                          ->   "metrics": [
 IPC   PMC0/PMC1                  ->     {
                                 ->       "name" : "IPC",
                                 ->       "calc" : "PMC0/PMC1",
-                                 ->       "socket_scope": false,
+                                 ->       "type": "hwthread",
                                 ->       "publish": true
                                 ->     }
                                 ->   ]
 ```

-The `socket_scope` option tells whether it is submitted per socket or per hwthread. If a metric is only used for internal calculations, you can set `publish = false`.
-
-Since some metrics can only be gathered in multiple measurements (like the memory bandwidth on AMD Zen3 chips), configure multiple eventsets like in the example config and use the `globalmetrics` section to combine them. **Be aware** that the combination might be misleading because the "behavior" of a metric changes over time and the multiple measurements might count different computing phases.
+The script `scripts/likwid_perfgroup_to_cc_config.py` might help you.
--- a/collectors/loadavgMetric.go
+++ b/collectors/loadavgMetric.go
@@ -2,29 +2,41 @@ package collectors

 import (
 	"encoding/json"
-	"io/ioutil"
+	"fmt"
+	"os"
 	"strconv"
 	"strings"
 	"time"
-	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
+
+	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
 )

-const LOADAVGFILE = `/proc/loadavg`
-
-type LoadavgCollectorConfig struct {
-	ExcludeMetrics []string `json:"exclude_metrics,omitempty"`
-}
+//
+// LoadavgCollector collects:
+// * load average of last 1, 5 & 15 minutes
+// * number of processes currently runnable
+// * total number of processes in system
+//
+// See: https://www.kernel.org/doc/html/latest/filesystems/proc.html
+//
+const LOADAVGFILE = "/proc/loadavg"

 type LoadavgCollector struct {
 	metricCollector
 	tags         map[string]string
 	load_matches []string
+	load_skips   []bool
 	proc_matches []string
-	config       LoadavgCollectorConfig
+	proc_skips   []bool
+	config       struct {
+		ExcludeMetrics []string `json:"exclude_metrics,omitempty"`
+	}
 }

 func (m *LoadavgCollector) Init(config json.RawMessage) error {
 	m.name = "LoadavgCollector"
+	m.parallel = true
 	m.setup()
 	if len(config) > 0 {
 		err := json.Unmarshal(config, &m.config)
@@ -32,46 +44,82 @@ func (m *LoadavgCollector) Init(config json.RawMessage) error {
 			return err
 		}
 	}
-	m.meta = map[string]string{"source": m.name, "group": "LOAD"}
+	m.meta = map[string]string{
+		"source": m.name,
+		"group":  "LOAD"}
 	m.tags = map[string]string{"type": "node"}
-	m.load_matches = []string{"load_one", "load_five", "load_fifteen"}
-	m.proc_matches = []string{"proc_run", "proc_total"}
+	m.load_matches = []string{
+		"load_one",
+		"load_five",
+		"load_fifteen"}
+	m.load_skips = make([]bool, len(m.load_matches))
+	m.proc_matches = []string{
+		"proc_run",
+		"proc_total"}
+	m.proc_skips = make([]bool, len(m.proc_matches))
+
+	for i, name := range m.load_matches {
+		_, m.load_skips[i] = stringArrayContains(m.config.ExcludeMetrics, name)
+	}
+	for i, name := range m.proc_matches {
+		_, m.proc_skips[i] = stringArrayContains(m.config.ExcludeMetrics, name)
+	}
 	m.init = true
 	return nil
 }

 func (m *LoadavgCollector) Read(interval time.Duration, output chan lp.CCMetric) {
-	var skip bool
 	if !m.init {
 		return
 	}
-	buffer, err := ioutil.ReadFile(string(LOADAVGFILE))
-
+	buffer, err := os.ReadFile(LOADAVGFILE)
 	if err != nil {
+		if err != nil {
+			cclog.ComponentError(
+				m.name,
+				fmt.Sprintf("Read(): Failed to read file '%s': %v", LOADAVGFILE, err))
+		}
 		return
 	}
+	now := time.Now()

+	// Load metrics
 	ls := strings.Split(string(buffer), ` `)
 	for i, name := range m.load_matches {
 		x, err := strconv.ParseFloat(ls[i], 64)
+		if err != nil {
+			cclog.ComponentError(
+				m.name,
+				fmt.Sprintf("Read(): Failed to convert '%s' to float64: %v", ls[i], err))
+			continue
+		}
+		if m.load_skips[i] {
+			continue
+		}
+		y, err := lp.New(name, m.tags, m.meta, map[string]interface{}{"value": x}, now)
 		if err == nil {
-			_, skip = stringArrayContains(m.config.ExcludeMetrics, name)
-			y, err := lp.New(name, m.tags, m.meta, map[string]interface{}{"value": float64(x)}, time.Now())
-			if err == nil && !skip {
-				output <- y
-			}
+			output <- y
 		}
 	}
+
+	// Process metrics
 	lv := strings.Split(ls[3], `/`)
 	for i, name := range m.proc_matches {
-		x, err := strconv.ParseFloat(lv[i], 64)
-		if err == nil {
-			_, skip = stringArrayContains(m.config.ExcludeMetrics, name)
-			y, err := lp.New(name, m.tags, m.meta, map[string]interface{}{"value": float64(x)}, time.Now())
-			if err == nil && !skip {
-				output <- y
-			}
+		x, err := strconv.ParseInt(lv[i], 10, 64)
+		if err != nil {
+			cclog.ComponentError(
+				m.name,
+				fmt.Sprintf("Read(): Failed to convert '%s' to float64: %v", lv[i], err))
+			continue
 		}
+		if m.proc_skips[i] {
+			continue
+		}
+		y, err := lp.New(name, m.tags, m.meta, map[string]interface{}{"value": x}, now)
+		if err == nil {
+			output <- y
+		}
+
 	}
 }

--- a/collectors/lustreMetric.go
+++ b/collectors/lustreMetric.go
@@ -3,32 +3,292 @@ package collectors
 import (
 	"encoding/json"
 	"errors"
-	"io/ioutil"
-	"log"
+	"fmt"
+	"os/exec"
+	"os/user"
 	"strconv"
 	"strings"
 	"time"
-	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
+
+	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
 )

-const LUSTREFILE = `/proc/fs/lustre/llite/lnec-XXXXXX/stats`
+const LUSTRE_SYSFS = `/sys/fs/lustre`
+const LCTL_CMD = `lctl`
+const LCTL_OPTION = `get_param`

 type LustreCollectorConfig struct {
-	Procfiles      []string `json:"procfiles"`
-	ExcludeMetrics []string `json:"exclude_metrics"`
+	LCtlCommand        string   `json:"lctl_command,omitempty"`
+	ExcludeMetrics     []string `json:"exclude_metrics,omitempty"`
+	Sudo               bool     `json:"use_sudo,omitempty"`
+	SendAbsoluteValues bool     `json:"send_abs_values,omitempty"`
+	SendDerivedValues  bool     `json:"send_derived_values,omitempty"`
+	SendDiffValues     bool     `json:"send_diff_values,omitempty"`
+}
+
+type LustreMetricDefinition struct {
+	name       string
+	lineprefix string
+	lineoffset int
+	unit       string
+	calc       string
 }

 type LustreCollector struct {
 	metricCollector
-	tags    map[string]string
-	matches map[string]map[string]int
-	devices []string
-	config  LustreCollectorConfig
+	tags          map[string]string
+	config        LustreCollectorConfig
+	lctl          string
+	sudoCmd       string
+	lastTimestamp time.Time                   // Store time stamp of last tick to derive bandwidths
+	definitions   []LustreMetricDefinition    // Combined list without excluded metrics
+	stats         map[string]map[string]int64 // Data for last value per device and metric
+}
+
+func (m *LustreCollector) getDeviceDataCommand(device string) []string {
+	var command *exec.Cmd
+	statsfile := fmt.Sprintf("llite.%s.stats", device)
+	if m.config.Sudo {
+		command = exec.Command(m.sudoCmd, m.lctl, LCTL_OPTION, statsfile)
+	} else {
+		command = exec.Command(m.lctl, LCTL_OPTION, statsfile)
+	}
+	command.Wait()
+	stdout, _ := command.Output()
+	return strings.Split(string(stdout), "\n")
+}
+
+func (m *LustreCollector) getDevices() []string {
+	devices := make([]string, 0)
+
+	// //Version reading devices from sysfs
+	// globPattern := filepath.Join(LUSTRE_SYSFS, "llite/*/stats")
+	// files, err := filepath.Glob(globPattern)
+	// if err != nil {
+	// 	return devices
+	// }
+	// for _, f := range files {
+	// 	pathlist := strings.Split(f, "/")
+	// 	devices = append(devices, pathlist[4])
+	// }
+
+	data := m.getDeviceDataCommand("*")
+
+	for _, line := range data {
+		if strings.HasPrefix(line, "llite") {
+			linefields := strings.Split(line, ".")
+			if len(linefields) > 2 {
+				devices = append(devices, linefields[1])
+			}
+		}
+	}
+	return devices
+}
+
+func getMetricData(lines []string, prefix string, offset int) (int64, error) {
+	for _, line := range lines {
+		if strings.HasPrefix(line, prefix) {
+			lf := strings.Fields(line)
+			return strconv.ParseInt(lf[offset], 0, 64)
+		}
+	}
+	return 0, errors.New("no such line in data")
+}
+
+// //Version reading the stats data of a device from sysfs
+// func (m *LustreCollector) getDeviceDataSysfs(device string) []string {
+// 	llitedir := filepath.Join(LUSTRE_SYSFS, "llite")
+// 	devdir := filepath.Join(llitedir, device)
+// 	statsfile := filepath.Join(devdir, "stats")
+// 	buffer, err := os.ReadFile(statsfile)
+// 	if err != nil {
+// 		return make([]string, 0)
+// 	}
+// 	return strings.Split(string(buffer), "\n")
+// }
+
+var LustreAbsMetrics = []LustreMetricDefinition{
+	{
+		name:       "lustre_read_requests",
+		lineprefix: "read_bytes",
+		lineoffset: 1,
+		unit:       "requests",
+		calc:       "none",
+	},
+	{
+		name:       "lustre_write_requests",
+		lineprefix: "write_bytes",
+		lineoffset: 1,
+		unit:       "requests",
+		calc:       "none",
+	},
+	{
+		name:       "lustre_read_bytes",
+		lineprefix: "read_bytes",
+		lineoffset: 6,
+		unit:       "bytes",
+		calc:       "none",
+	},
+	{
+		name:       "lustre_write_bytes",
+		lineprefix: "write_bytes",
+		lineoffset: 6,
+		unit:       "bytes",
+		calc:       "none",
+	},
+	{
+		name:       "lustre_open",
+		lineprefix: "open",
+		lineoffset: 1,
+		unit:       "",
+		calc:       "none",
+	},
+	{
+		name:       "lustre_close",
+		lineprefix: "close",
+		lineoffset: 1,
+		unit:       "",
+		calc:       "none",
+	},
+	{
+		name:       "lustre_setattr",
+		lineprefix: "setattr",
+		lineoffset: 1,
+		unit:       "",
+		calc:       "none",
+	},
+	{
+		name:       "lustre_getattr",
+		lineprefix: "getattr",
+		lineoffset: 1,
+		unit:       "",
+		calc:       "none",
+	},
+	{
+		name:       "lustre_statfs",
+		lineprefix: "statfs",
+		lineoffset: 1,
+		unit:       "",
+		calc:       "none",
+	},
+	{
+		name:       "lustre_inode_permission",
+		lineprefix: "inode_permission",
+		lineoffset: 1,
+		unit:       "",
+		calc:       "none",
+	},
+}
+
+var LustreDiffMetrics = []LustreMetricDefinition{
+	{
+		name:       "lustre_read_requests_diff",
+		lineprefix: "read_bytes",
+		lineoffset: 1,
+		unit:       "requests",
+		calc:       "difference",
+	},
+	{
+		name:       "lustre_write_requests_diff",
+		lineprefix: "write_bytes",
+		lineoffset: 1,
+		unit:       "requests",
+		calc:       "difference",
+	},
+	{
+		name:       "lustre_read_bytes_diff",
+		lineprefix: "read_bytes",
+		lineoffset: 6,
+		unit:       "bytes",
+		calc:       "difference",
+	},
+	{
+		name:       "lustre_write_bytes_diff",
+		lineprefix: "write_bytes",
+		lineoffset: 6,
+		unit:       "bytes",
+		calc:       "difference",
+	},
+	{
+		name:       "lustre_open_diff",
+		lineprefix: "open",
+		lineoffset: 1,
+		unit:       "",
+		calc:       "difference",
+	},
+	{
+		name:       "lustre_close_diff",
+		lineprefix: "close",
+		lineoffset: 1,
+		unit:       "",
+		calc:       "difference",
+	},
+	{
+		name:       "lustre_setattr_diff",
+		lineprefix: "setattr",
+		lineoffset: 1,
+		unit:       "",
+		calc:       "difference",
+	},
+	{
+		name:       "lustre_getattr_diff",
+		lineprefix: "getattr",
+		lineoffset: 1,
+		unit:       "",
+		calc:       "difference",
+	},
+	{
+		name:       "lustre_statfs_diff",
+		lineprefix: "statfs",
+		lineoffset: 1,
+		unit:       "",
+		calc:       "difference",
+	},
+	{
+		name:       "lustre_inode_permission_diff",
+		lineprefix: "inode_permission",
+		lineoffset: 1,
+		unit:       "",
+		calc:       "difference",
+	},
+}
+
+var LustreDeriveMetrics = []LustreMetricDefinition{
+	{
+		name:       "lustre_read_requests_rate",
+		lineprefix: "read_bytes",
+		lineoffset: 1,
+		unit:       "requests/sec",
+		calc:       "derivative",
+	},
+	{
+		name:       "lustre_write_requests_rate",
+		lineprefix: "write_bytes",
+		lineoffset: 1,
+		unit:       "requests/sec",
+		calc:       "derivative",
+	},
+	{
+		name:       "lustre_read_bw",
+		lineprefix: "read_bytes",
+		lineoffset: 6,
+		unit:       "bytes/sec",
+		calc:       "derivative",
+	},
+	{
+		name:       "lustre_write_bw",
+		lineprefix: "write_bytes",
+		lineoffset: 6,
+		unit:       "bytes/sec",
+		calc:       "derivative",
+	},
 }

 func (m *LustreCollector) Init(config json.RawMessage) error {
 	var err error
 	m.name = "LustreCollector"
+	m.parallel = true
 	if len(config) > 0 {
 		err = json.Unmarshal(config, &m.config)
 		if err != nil {
@@ -38,28 +298,81 @@ func (m *LustreCollector) Init(config json.RawMessage) error {
 	m.setup()
 	m.tags = map[string]string{"type": "node"}
 	m.meta = map[string]string{"source": m.name, "group": "Lustre"}
-	m.matches = map[string]map[string]int{"read_bytes": {"read_bytes": 6, "read_requests": 1},
-		"write_bytes":      {"write_bytes": 6, "write_requests": 1},
-		"open":             {"open": 1},
-		"close":            {"close": 1},
-		"setattr":          {"setattr": 1},
-		"getattr":          {"getattr": 1},
-		"statfs":           {"statfs": 1},
-		"inode_permission": {"inode_permission": 1}}
-	m.devices = make([]string, 0)
-	for _, p := range m.config.Procfiles {
-		_, err := ioutil.ReadFile(p)
-		if err == nil {
-			m.devices = append(m.devices, p)
-		} else {
-			log.Print(err.Error())
-			continue
+
+	// Lustre file system statistics can only be queried by user root
+	// or with password-less sudo
+	if !m.config.Sudo {
+		user, err := user.Current()
+		if err != nil {
+			cclog.ComponentError(m.name, "Failed to get current user:", err.Error())
+			return err
 		}
+		if user.Uid != "0" {
+			cclog.ComponentError(m.name, "Lustre file system statistics can only be queried by user root")
+			return err
+		}
+	} else {
+		p, err := exec.LookPath("sudo")
+		if err != nil {
+			cclog.ComponentError(m.name, "Cannot find 'sudo'")
+			return err
+		}
+		m.sudoCmd = p
 	}

-	if len(m.devices) == 0 {
-		return errors.New("No metrics to collect")
+	p, err := exec.LookPath(m.config.LCtlCommand)
+	if err != nil {
+		p, err = exec.LookPath(LCTL_CMD)
+		if err != nil {
+			return err
+		}
 	}
+	m.lctl = p
+
+	m.definitions = []LustreMetricDefinition{}
+	if m.config.SendAbsoluteValues {
+		for _, def := range LustreAbsMetrics {
+			if _, skip := stringArrayContains(m.config.ExcludeMetrics, def.name); !skip {
+				m.definitions = append(m.definitions, def)
+			}
+		}
+	}
+	if m.config.SendDiffValues {
+		for _, def := range LustreDiffMetrics {
+			if _, skip := stringArrayContains(m.config.ExcludeMetrics, def.name); !skip {
+				m.definitions = append(m.definitions, def)
+			}
+		}
+	}
+	if m.config.SendDerivedValues {
+		for _, def := range LustreDeriveMetrics {
+			if _, skip := stringArrayContains(m.config.ExcludeMetrics, def.name); !skip {
+				m.definitions = append(m.definitions, def)
+			}
+		}
+	}
+	if len(m.definitions) == 0 {
+		return errors.New("no metrics to collect")
+	}
+
+	devices := m.getDevices()
+	if len(devices) == 0 {
+		return errors.New("no Lustre devices found")
+	}
+	m.stats = make(map[string]map[string]int64)
+	for _, d := range devices {
+		m.stats[d] = make(map[string]int64)
+		data := m.getDeviceDataCommand(d)
+		for _, def := range m.definitions {
+			x, err := getMetricData(data, def.lineprefix, def.lineoffset)
+			if err == nil {
+				m.stats[d][def.name] = x
+			} else {
+				m.stats[d][def.name] = 0
+			}
+		}
+	}
+	m.lastTimestamp = time.Now()
 	m.init = true
 	return nil
 }
@@ -68,40 +381,49 @@ func (m *LustreCollector) Read(interval time.Duration, output chan lp.CCMetric)
 	if !m.init {
 		return
 	}
-	for _, p := range m.devices {
-		buffer, err := ioutil.ReadFile(p)
-
-		if err != nil {
-			log.Print(err)
-			return
-		}
-
-		for _, line := range strings.Split(string(buffer), "\n") {
-			lf := strings.Fields(line)
-			if len(lf) > 1 {
-				for match, fields := range m.matches {
-					if lf[0] == match {
-						for name, idx := range fields {
-							_, skip := stringArrayContains(m.config.ExcludeMetrics, name)
-							if skip {
-								continue
-							}
-							x, err := strconv.ParseInt(lf[idx], 0, 64)
-							if err == nil {
-								y, err := lp.New(name, m.tags, m.meta, map[string]interface{}{"value": x}, time.Now())
-								if err == nil {
-									if strings.Contains(name, "byte") {
-										y.AddMeta("unit", "Byte")
-									}
-									output <- y
-								}
-							}
-						}
-					}
-				}
+	now := time.Now()
+	tdiff := now.Sub(m.lastTimestamp)
+	for device, devData := range m.stats {
+		data := m.getDeviceDataCommand(device)
+		for _, def := range m.definitions {
+			var use_x int64
+			var err error
+			var y lp.CCMetric
+			x, err := getMetricData(data, def.lineprefix, def.lineoffset)
+			if err == nil {
+				use_x = x
+			} else {
+				use_x = devData[def.name]
 			}
+			var value interface{}
+			switch def.calc {
+			case "none":
+				value = use_x
+				y, err = lp.New(def.name, m.tags, m.meta, map[string]interface{}{"value": value}, time.Now())
+			case "difference":
+				value = use_x - devData[def.name]
+				if value.(int64) < 0 {
+					value = 0
+				}
+				y, err = lp.New(def.name, m.tags, m.meta, map[string]interface{}{"value": value}, time.Now())
+			case "derivative":
+				value = float64(use_x-devData[def.name]) / tdiff.Seconds()
+				if value.(float64) < 0 {
+					value = 0
+				}
+				y, err = lp.New(def.name, m.tags, m.meta, map[string]interface{}{"value": value}, time.Now())
+			}
+			if err == nil {
+				y.AddTag("device", device)
+				if len(def.unit) > 0 {
+					y.AddMeta("unit", def.unit)
+				}
+				output <- y
+			}
+			devData[def.name] = use_x
 		}
 	}
+	m.lastTimestamp = now
 }

 func (m *LustreCollector) Close() {
--- a/collectors/lustreMetric.md
+++ b/collectors/lustreMetric.md
@@ -3,27 +3,44 @@

 ```json
  "lustrestat": {
-    "procfiles" : [
-      "/proc/fs/lustre/llite/lnec-XXXXXX/stats"
-    ],
+    "lctl_command": "/path/to/lctl",
    "exclude_metrics": [
      "setattr",
      "getattr"
-    ]
+    ],
+    "send_abs_values" : true,
+    "send_derived_values" : true,
+    "send_diff_values": true,
+    "use_sudo": false
  }
 ```

-The `lustrestat` collector reads from the procfs stat files for Lustre like `/proc/fs/lustre/llite/lnec-XXXXXX/stats`.
+The `lustrestat` collector uses the `lctl` application with the `get_param` option to get all `llite` metrics (Lustre client). The `llite` metrics are only available for root users. If password-less sudo is configured, you can enable `sudo` in the configuration.

 Metrics:
-* `read_bytes`
-* `read_requests`
-* `write_bytes`
-* `write_requests`
-* `open`
-* `close`
-* `getattr`
-* `setattr`
-* `statfs`
-* `inode_permission`
+* `lustre_read_bytes` (unit `bytes`)
+* `lustre_read_requests` (unit `requests`)
+* `lustre_write_bytes` (unit `bytes`)
+* `lustre_write_requests` (unit `requests`)
+* `lustre_open`
+* `lustre_close`
+* `lustre_getattr`
+* `lustre_setattr`
+* `lustre_statfs`
+* `lustre_inode_permission`
+* `lustre_read_bw` (if `send_derived_values == true`, unit `bytes/sec`)
+* `lustre_write_bw` (if `send_derived_values == true`, unit `bytes/sec`)
+* `lustre_read_requests_rate` (if `send_derived_values == true`, unit `requests/sec`)
+* `lustre_write_requests_rate` (if `send_derived_values == true`, unit `requests/sec`)
+* `lustre_read_bytes_diff` (if `send_diff_values == true`, unit `bytes`)
+* `lustre_read_requests_diff` (if `send_diff_values == true`, unit `requests`)
+* `lustre_write_bytes_diff` (if `send_diff_values == true`, unit `bytes`)
+* `lustre_write_requests_diff` (if `send_diff_values == true`, unit `requests`)
+* `lustre_open_diff` (if `send_diff_values == true`)
+* `lustre_close_diff` (if `send_diff_values == true`)
+* `lustre_getattr_diff` (if `send_diff_values == true`)
+* `lustre_setattr_diff` (if `send_diff_values == true`)
+* `lustre_statfs_diff` (if `send_diff_values == true`)
+* `lustre_inode_permission_diff` (if `send_diff_values == true`)

+This collector adds an `device` tag.
--- a/collectors/memstatMetric.go
+++ b/collectors/memstatMetric.go
@@ -1,46 +1,102 @@
 package collectors

 import (
+	"bufio"
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
-	"log"
+	"os"
+	"path/filepath"
+	"regexp"
 	"strconv"
 	"strings"
 	"time"

-	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
+	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
 )

-const MEMSTATFILE = `/proc/meminfo`
+const MEMSTATFILE = "/proc/meminfo"
+const NUMA_MEMSTAT_BASE = "/sys/devices/system/node"

 type MemstatCollectorConfig struct {
 	ExcludeMetrics []string `json:"exclude_metrics"`
+	NodeStats      bool     `json:"node_stats,omitempty"`
+	NumaStats      bool     `json:"numa_stats,omitempty"`
+}
+
+type MemstatCollectorNode struct {
+	file string
+	tags map[string]string
 }

 type MemstatCollector struct {
 	metricCollector
-	stats   map[string]int64
-	tags    map[string]string
-	matches map[string]string
-	config  MemstatCollectorConfig
+	stats       map[string]int64
+	tags        map[string]string
+	matches     map[string]string
+	config      MemstatCollectorConfig
+	nodefiles   map[int]MemstatCollectorNode
+	sendMemUsed bool
+}
+
+type MemstatStats struct {
+	value float64
+	unit  string
+}
+
+func getStats(filename string) map[string]MemstatStats {
+	stats := make(map[string]MemstatStats)
+	file, err := os.Open(filename)
+	if err != nil {
+		cclog.Error(err.Error())
+	}
+	defer file.Close()
+
+	scanner := bufio.NewScanner(file)
+	for scanner.Scan() {
+		line := scanner.Text()
+		linefields := strings.Fields(line)
+		if len(linefields) == 3 {
+			v, err := strconv.ParseFloat(linefields[1], 64)
+			if err == nil {
+				stats[strings.Trim(linefields[0], ":")] = MemstatStats{
+					value: v,
+					unit:  linefields[2],
+				}
+			}
+		} else if len(linefields) == 5 {
+			v, err := strconv.ParseFloat(linefields[3], 64)
+			if err == nil {
+				cclog.ComponentDebug("getStats", strings.Trim(linefields[2], ":"), v, linefields[4])
+				stats[strings.Trim(linefields[2], ":")] = MemstatStats{
+					value: v,
+					unit:  linefields[4],
+				}
+			}
+		}
+	}
+	return stats
 }

 func (m *MemstatCollector) Init(config json.RawMessage) error {
 	var err error
 	m.name = "MemstatCollector"
+	m.parallel = true
+	m.config.NodeStats = true
+	m.config.NumaStats = false
 	if len(config) > 0 {
 		err = json.Unmarshal(config, &m.config)
 		if err != nil {
 			return err
 		}
 	}
-	m.meta = map[string]string{"source": m.name, "group": "Memory", "unit": "kByte"}
+	m.meta = map[string]string{"source": m.name, "group": "Memory"}
 	m.stats = make(map[string]int64)
 	m.matches = make(map[string]string)
 	m.tags = map[string]string{"type": "node"}
-	matches := map[string]string{`MemTotal`: "mem_total",
+	matches := map[string]string{
+		"MemTotal":     "mem_total",
 		"SwapTotal":    "swap_total",
 		"SReclaimable": "mem_sreclaimable",
 		"Slab":         "mem_slab",
@@ -48,21 +104,58 @@ func (m *MemstatCollector) Init(config json.RawMessage) error {
 		"Buffers":      "mem_buffers",
 		"Cached":       "mem_cached",
 		"MemAvailable": "mem_available",
-		"SwapFree":     "swap_free"}
+		"SwapFree":     "swap_free",
+		"MemShared":    "mem_shared",
+	}
 	for k, v := range matches {
 		_, skip := stringArrayContains(m.config.ExcludeMetrics, k)
 		if !skip {
 			m.matches[k] = v
 		}
 	}
+	m.sendMemUsed = false
+	if _, skip := stringArrayContains(m.config.ExcludeMetrics, "mem_used"); !skip {
+		m.sendMemUsed = true
+	}
 	if len(m.matches) == 0 {
-		return errors.New("No metrics to collect")
+		return errors.New("no metrics to collect")
 	}
 	m.setup()
-	_, err = ioutil.ReadFile(string(MEMSTATFILE))
-	if err == nil {
-		m.init = true
+
+	if m.config.NodeStats {
+		if stats := getStats(MEMSTATFILE); len(stats) == 0 {
+			return fmt.Errorf("cannot read data from file %s", MEMSTATFILE)
+		}
 	}
+
+	if m.config.NumaStats {
+		globPattern := filepath.Join(NUMA_MEMSTAT_BASE, "node[0-9]*", "meminfo")
+		regex := regexp.MustCompile(filepath.Join(NUMA_MEMSTAT_BASE, "node(\\d+)", "meminfo"))
+		files, err := filepath.Glob(globPattern)
+		if err == nil {
+			m.nodefiles = make(map[int]MemstatCollectorNode)
+			for _, f := range files {
+				if stats := getStats(f); len(stats) == 0 {
+					return fmt.Errorf("cannot read data from file %s", f)
+				}
+				rematch := regex.FindStringSubmatch(f)
+				if len(rematch) == 2 {
+					id, err := strconv.Atoi(rematch[1])
+					if err == nil {
+						f := MemstatCollectorNode{
+							file: f,
+							tags: map[string]string{
+								"type":    "memoryDomain",
+								"type-id": fmt.Sprintf("%d", id),
+							},
+						}
+						m.nodefiles[id] = f
+					}
+				}
+			}
+		}
+	}
+	m.init = true
 	return err
 }

@@ -71,56 +164,69 @@ func (m *MemstatCollector) Read(interval time.Duration, output chan lp.CCMetric)
 		return
 	}

-	buffer, err := ioutil.ReadFile(string(MEMSTATFILE))
-	if err != nil {
-		log.Print(err)
-		return
-	}
-
-	ll := strings.Split(string(buffer), "\n")
-	for _, line := range ll {
-		ls := strings.Split(line, `:`)
-		if len(ls) > 1 {
-			lv := strings.Fields(ls[1])
-			m.stats[ls[0]], err = strconv.ParseInt(lv[0], 0, 64)
-		}
-	}
-
-	if _, exists := m.stats[`MemTotal`]; !exists {
-		err = errors.New("Parse error")
-		log.Print(err)
-		return
-	}
-
-	for match, name := range m.matches {
-		if _, exists := m.stats[match]; !exists {
-			err = fmt.Errorf("Parse error for %s : %s", match, name)
-			log.Print(err)
-			continue
-		}
-		y, err := lp.New(name, m.tags, m.meta, map[string]interface{}{"value": int(float64(m.stats[match]) * 1.0e-3)}, time.Now())
-		if err == nil {
-			output <- y
-		}
-	}
-
-	if _, free := m.stats[`MemFree`]; free {
-		if _, buffers := m.stats[`Buffers`]; buffers {
-			if _, cached := m.stats[`Cached`]; cached {
-				memUsed := m.stats[`MemTotal`] - (m.stats[`MemFree`] + m.stats[`Buffers`] + m.stats[`Cached`])
-				_, skip := stringArrayContains(m.config.ExcludeMetrics, "mem_used")
-				y, err := lp.New("mem_used", m.tags, m.meta, map[string]interface{}{"value": int(float64(memUsed) * 1.0e-3)}, time.Now())
-				if err == nil && !skip {
-					output <- y
+	sendStats := func(stats map[string]MemstatStats, tags map[string]string) {
+		for match, name := range m.matches {
+			var value float64 = 0
+			var unit string = ""
+			if v, ok := stats[match]; ok {
+				value = v.value
+				if len(v.unit) > 0 {
+					unit = v.unit
 				}
 			}
+
+			y, err := lp.New(name, tags, m.meta, map[string]interface{}{"value": value}, time.Now())
+			if err == nil {
+				if len(unit) > 0 {
+					y.AddMeta("unit", unit)
+				}
+				output <- y
+			}
+		}
+		if m.sendMemUsed {
+			memUsed := 0.0
+			unit := ""
+			if totalVal, total := stats["MemTotal"]; total {
+				if freeVal, free := stats["MemFree"]; free {
+					memUsed = totalVal.value - freeVal.value
+					if len(totalVal.unit) > 0 {
+						unit = totalVal.unit
+					} else if len(freeVal.unit) > 0 {
+						unit = freeVal.unit
+					}
+					if bufVal, buffers := stats["Buffers"]; buffers {
+						memUsed -= bufVal.value
+						if len(bufVal.unit) > 0 && len(unit) == 0 {
+							unit = bufVal.unit
+						}
+						if cacheVal, cached := stats["Cached"]; cached {
+							memUsed -= cacheVal.value
+							if len(cacheVal.unit) > 0 && len(unit) == 0 {
+								unit = cacheVal.unit
+							}
+						}
+					}
+				}
+			}
+			y, err := lp.New("mem_used", tags, m.meta, map[string]interface{}{"value": memUsed}, time.Now())
+			if err == nil {
+				if len(unit) > 0 {
+					y.AddMeta("unit", unit)
+				}
+				output <- y
+			}
 		}
 	}
-	if _, found := m.stats[`MemShared`]; found {
-		_, skip := stringArrayContains(m.config.ExcludeMetrics, "mem_shared")
-		y, err := lp.New("mem_shared", m.tags, m.meta, map[string]interface{}{"value": int(float64(m.stats[`MemShared`]) * 1.0e-3)}, time.Now())
-		if err == nil && !skip {
-			output <- y
+
+	if m.config.NodeStats {
+		nodestats := getStats(MEMSTATFILE)
+		sendStats(nodestats, m.tags)
+	}
+
+	if m.config.NumaStats {
+		for _, nodeConf := range m.nodefiles {
+			stats := getStats(nodeConf.file)
+			sendStats(stats, nodeConf.tags)
 		}
 	}
 }
--- a/collectors/metricCollector.go
+++ b/collectors/metricCollector.go
@@ -3,40 +3,43 @@ package collectors
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
-	"log"
-	"strconv"
-	"strings"
 	"time"

-	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
-	influx "github.com/influxdata/line-protocol"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
 )

 type MetricCollector interface {
-	Name() string
-	Init(config json.RawMessage) error
-	Initialized() bool
-	Read(duration time.Duration, output chan lp.CCMetric)
-	Close()
+	Name() string                      // Name of the metric collector
+	Init(config json.RawMessage) error // Initialize metric collector
+	Initialized() bool                 // Is metric collector initialized?
+	Parallel() bool
+	Read(duration time.Duration, output chan lp.CCMetric) // Read metrics from metric collector
+	Close()                                               // Close / finish metric collector
 }

 type metricCollector struct {
-	name string
-	init bool
-	meta map[string]string
+	name     string            // name of the metric
+	init     bool              // is metric collector initialized?
+	parallel bool              // can the metric collector be executed in parallel with others
+	meta     map[string]string // static meta data tags
 }

-// Name() returns the name of the metric collector
+// Name returns the name of the metric collector
 func (c *metricCollector) Name() string {
 	return c.name
 }

+// Name returns the name of the metric collector
+func (c *metricCollector) Parallel() bool {
+	return c.parallel
+}
+
+// Setup is for future use
 func (c *metricCollector) setup() error {
 	return nil
 }

-// Initialized() indicates whether the metric collector has been initialized.
+// Initialized indicates whether the metric collector has been initialized
 func (c *metricCollector) Initialized() bool {
 	return c.init
 }
@@ -65,81 +68,13 @@ func stringArrayContains(array []string, str string) (int, bool) {
 	return -1, false
 }

-func SocketList() []int {
-	buffer, err := ioutil.ReadFile("/proc/cpuinfo")
-	if err != nil {
-		log.Print(err)
-		return nil
-	}
-	ll := strings.Split(string(buffer), "\n")
-	var packs []int
-	for _, line := range ll {
-		if strings.HasPrefix(line, "physical id") {
-			lv := strings.Fields(line)
-			id, err := strconv.ParseInt(lv[3], 10, 32)
-			if err != nil {
-				log.Print(err)
-				return packs
-			}
-			_, found := intArrayContains(packs, int(id))
-			if !found {
-				packs = append(packs, int(id))
-			}
-		}
-	}
-	return packs
-}
-
-func CpuList() []int {
-	buffer, err := ioutil.ReadFile("/proc/cpuinfo")
-	if err != nil {
-		log.Print(err)
-		return nil
-	}
-	ll := strings.Split(string(buffer), "\n")
-	var cpulist []int
-	for _, line := range ll {
-		if strings.HasPrefix(line, "processor") {
-			lv := strings.Fields(line)
-			id, err := strconv.ParseInt(lv[2], 10, 32)
-			if err != nil {
-				log.Print(err)
-				return cpulist
-			}
-			_, found := intArrayContains(cpulist, int(id))
-			if !found {
-				cpulist = append(cpulist, int(id))
-			}
-		}
-	}
-	return cpulist
-}
-
-// Tags2Map stores a InfluxDB list of tags in a map of key value pairs
-func Tags2Map(metric influx.Metric) map[string]string {
-	tags := make(map[string]string)
-	for _, t := range metric.TagList() {
-		tags[t.Key] = t.Value
-	}
-	return tags
-}
-
-// Fields2Map stores a InfluxDB list of fields in a map of key value pairs
-func Fields2Map(metric influx.Metric) map[string]interface{} {
-	fields := make(map[string]interface{})
-	for _, f := range metric.FieldList() {
-		fields[f.Key] = f.Value
-	}
-	return fields
-}
-
 // RemoveFromStringList removes the string r from the array of strings s
 // If r is not contained in the array an error is returned
 func RemoveFromStringList(s []string, r string) ([]string, error) {
-	for i, item := range s {
-		if r == item {
+	for i := range s {
+		if r == s[i] {
 			return append(s[:i], s[i+1:]...), nil
 		}
 	}
-	return s, fmt.Errorf("No such string in list")
+	return s, fmt.Errorf("no such string in list")
 }
--- a/collectors/netstatMetric.go
+++ b/collectors/netstatMetric.go
@@ -1,92 +1,218 @@
 package collectors

 import (
+	"bufio"
 	"encoding/json"
-	"io/ioutil"
-	"log"
+	"errors"
+	"os"
 	"strconv"
 	"strings"
 	"time"
-	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
+
+	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
 )

-const NETSTATFILE = `/proc/net/dev`
+const NETSTATFILE = "/proc/net/dev"

 type NetstatCollectorConfig struct {
-	ExcludeDevices []string `json:"exclude_devices"`
+	IncludeDevices     []string `json:"include_devices"`
+	SendAbsoluteValues bool     `json:"send_abs_values"`
+	SendDerivedValues  bool     `json:"send_derived_values"`
+}
+
+type NetstatCollectorMetric struct {
+	name       string
+	index      int
+	tags       map[string]string
+	meta       map[string]string
+	meta_rates map[string]string
+	lastValue  int64
 }

 type NetstatCollector struct {
 	metricCollector
-	config  NetstatCollectorConfig
-	matches map[int]string
+	config        NetstatCollectorConfig
+	matches       map[string][]NetstatCollectorMetric
+	lastTimestamp time.Time
 }

 func (m *NetstatCollector) Init(config json.RawMessage) error {
 	m.name = "NetstatCollector"
+	m.parallel = true
 	m.setup()
-	m.meta = map[string]string{"source": m.name, "group": "Memory"}
-	m.matches = map[int]string{
-		1:  "bytes_in",
-		9:  "bytes_out",
-		2:  "pkts_in",
-		10: "pkts_out",
-	}
+	m.lastTimestamp = time.Now()
+
+	const (
+		fieldInterface = iota
+		fieldReceiveBytes
+		fieldReceivePackets
+		fieldReceiveErrs
+		fieldReceiveDrop
+		fieldReceiveFifo
+		fieldReceiveFrame
+		fieldReceiveCompressed
+		fieldReceiveMulticast
+		fieldTransmitBytes
+		fieldTransmitPackets
+		fieldTransmitErrs
+		fieldTransmitDrop
+		fieldTransmitFifo
+		fieldTransmitColls
+		fieldTransmitCarrier
+		fieldTransmitCompressed
+	)
+
+	m.matches = make(map[string][]NetstatCollectorMetric)
+
+	// Set default configuration,
+	m.config.SendAbsoluteValues = true
+	m.config.SendDerivedValues = false
+	// Read configuration file, allow overwriting default config
 	if len(config) > 0 {
 		err := json.Unmarshal(config, &m.config)
 		if err != nil {
-			log.Print(err.Error())
+			cclog.ComponentError(m.name, "Error reading config:", err.Error())
 			return err
 		}
 	}
-	_, err := ioutil.ReadFile(string(NETSTATFILE))
-	if err == nil {
-		m.init = true
+
+	// Check access to net statistic file
+	file, err := os.Open(NETSTATFILE)
+	if err != nil {
+		cclog.ComponentError(m.name, err.Error())
+		return err
 	}
+	defer file.Close()
+
+	scanner := bufio.NewScanner(file)
+	for scanner.Scan() {
+		l := scanner.Text()
+
+		// Skip lines with no net device entry
+		if !strings.Contains(l, ":") {
+			continue
+		}
+
+		// Split line into fields
+		f := strings.Fields(l)
+
+		// Get net device entry
+		dev := strings.Trim(f[0], ": ")
+
+		// Check if device is a included device
+		if _, ok := stringArrayContains(m.config.IncludeDevices, dev); ok {
+			tags := map[string]string{"stype": "network", "stype-id": dev, "type": "node"}
+			meta_unit_byte := map[string]string{"source": m.name, "group": "Network", "unit": "bytes"}
+			meta_unit_byte_per_sec := map[string]string{"source": m.name, "group": "Network", "unit": "bytes/sec"}
+			meta_unit_pkts := map[string]string{"source": m.name, "group": "Network", "unit": "packets"}
+			meta_unit_pkts_per_sec := map[string]string{"source": m.name, "group": "Network", "unit": "packets/sec"}
+
+			m.matches[dev] = []NetstatCollectorMetric{
+				{
+					name:       "net_bytes_in",
+					index:      fieldReceiveBytes,
+					lastValue:  -1,
+					tags:       tags,
+					meta:       meta_unit_byte,
+					meta_rates: meta_unit_byte_per_sec,
+				},
+				{
+					name:       "net_pkts_in",
+					index:      fieldReceivePackets,
+					lastValue:  -1,
+					tags:       tags,
+					meta:       meta_unit_pkts,
+					meta_rates: meta_unit_pkts_per_sec,
+				},
+				{
+					name:       "net_bytes_out",
+					index:      fieldTransmitBytes,
+					lastValue:  -1,
+					tags:       tags,
+					meta:       meta_unit_byte,
+					meta_rates: meta_unit_byte_per_sec,
+				},
+				{
+					name:       "net_pkts_out",
+					index:      fieldTransmitPackets,
+					lastValue:  -1,
+					tags:       tags,
+					meta:       meta_unit_pkts,
+					meta_rates: meta_unit_pkts_per_sec,
+				},
+			}
+		}
+
+	}
+
+	if len(m.matches) == 0 {
+		return errors.New("no devices to collector metrics found")
+	}
+	m.init = true
 	return nil
 }

 func (m *NetstatCollector) Read(interval time.Duration, output chan lp.CCMetric) {
-	data, err := ioutil.ReadFile(string(NETSTATFILE))
-	if err != nil {
-		log.Print(err.Error())
+	if !m.init {
 		return
 	}
+	// Current time stamp
+	now := time.Now()
+	// time difference to last time stamp
+	timeDiff := now.Sub(m.lastTimestamp).Seconds()
+	// Save current timestamp
+	m.lastTimestamp = now

-	lines := strings.Split(string(data), "\n")
-	for _, l := range lines {
+	file, err := os.Open(string(NETSTATFILE))
+	if err != nil {
+		cclog.ComponentError(m.name, err.Error())
+		return
+	}
+	defer file.Close()
+
+	scanner := bufio.NewScanner(file)
+	for scanner.Scan() {
+		l := scanner.Text()
+
+		// Skip lines with no net device entry
 		if !strings.Contains(l, ":") {
 			continue
 		}
+
+		// Split line into fields
 		f := strings.Fields(l)
-		dev := f[0][0 : len(f[0])-1]
-		cont := false
-		for _, d := range m.config.ExcludeDevices {
-			if d == dev {
-				cont = true
-			}
-		}
-		if cont {
-			continue
-		}
-		tags := map[string]string{"device": dev, "type": "node"}
-		for i, name := range m.matches {
-			v, err := strconv.ParseInt(f[i], 10, 0)
-			if err == nil {
-				y, err := lp.New(name, tags, m.meta, map[string]interface{}{"value": int(float64(v) * 1.0e-3)}, time.Now())
-				if err == nil {
-					switch {
-					case strings.Contains(name, "byte"):
-						y.AddMeta("unit", "Byte")
-					case strings.Contains(name, "pkt"):
-						y.AddMeta("unit", "Packets")
+
+		// Get net device entry
+		dev := strings.Trim(f[0], ":")
+
+		// Check if device is a included device
+		if devmetrics, ok := m.matches[dev]; ok {
+			for i := range devmetrics {
+				metric := &devmetrics[i]
+
+				// Read value
+				v, err := strconv.ParseInt(f[metric.index], 10, 64)
+				if err != nil {
+					continue
+				}
+				if m.config.SendAbsoluteValues {
+					if y, err := lp.New(metric.name, metric.tags, metric.meta, map[string]interface{}{"value": v}, now); err == nil {
+						output <- y
 					}
-					output <- y
+				}
+				if m.config.SendDerivedValues {
+					if metric.lastValue >= 0 {
+						rate := float64(v-metric.lastValue) / timeDiff
+						if y, err := lp.New(metric.name+"_bw", metric.tags, metric.meta_rates, map[string]interface{}{"value": rate}, now); err == nil {
+							output <- y
+						}
+					}
+					metric.lastValue = v
 				}
 			}
 		}
 	}
-
 }

 func (m *NetstatCollector) Close() {
--- a/collectors/netstatMetric.md
+++ b/collectors/netstatMetric.md
@@ -3,19 +3,25 @@

 ```json
  "netstat": {
-    "exclude_devices": [
-      "lo"
-    ]
+    "include_devices": [
+      "eth0"
+    ],
+    "send_abs_values" : true,
+    "send_derived_values" : true
  }
 ```

-The `netstat` collector reads data from `/proc/net/dev` and outputs a handful **node** metrics. If a device is not required, it can be excluded from forwarding it to the sink. Commonly the `lo` device should be excluded.
+The `netstat` collector reads data from `/proc/net/dev` and outputs a handful **node** metrics. With the `include_devices` list you can specify which network devices should be measured. **Note**: Most other collectors use an _exclude_ list instead of an include list.

 Metrics:
-* `bytes_in`
-* `bytes_out`
-* `pkts_in`
-* `pkts_out`
+* `net_bytes_in` (`unit=bytes`)
+* `net_bytes_out` (`unit=bytes`)
+* `net_pkts_in` (`unit=packets`)
+* `net_pkts_out` (`unit=packets`)
+* `net_bytes_in_bw` (`unit=bytes/sec` if `send_derived_values == true`)
+* `net_bytes_out_bw` (`unit=bytes/sec` if `send_derived_values == true`)
+* `net_pkts_in_bw` (`unit=packets/sec` if `send_derived_values == true`)
+* `net_pkts_out_bw` (`unit=packets/sec` if `send_derived_values == true`)

-The device name is added as tag `device`.
+The device name is added as tag `stype=network,stype-id=<device>`.

--- a/collectors/nfs3Metric.md
+++ b/collectors/nfs3Metric.md
@@ -0,0 +1,39 @@
+
+## `nfs3stat` collector
+
+```json
+  "nfs3stat": {
+    "nfsstat" : "/path/to/nfsstat",
+    "exclude_metrics": [
+      "nfs3_total"
+    ]
+  }
+```
+
+The `nfs3stat` collector reads data from `nfsstat` command and outputs a handful **node** metrics. If a metric is not required, it can be excluded from forwarding it to the sink. There is currently no possibility to get the metrics per mount point.
+
+
+Metrics:
+* `nfs3_total` 
+* `nfs3_null` 
+* `nfs3_getattr` 
+* `nfs3_setattr` 
+* `nfs3_lookup` 
+* `nfs3_access` 
+* `nfs3_readlink` 
+* `nfs3_read` 
+* `nfs3_write` 
+* `nfs3_create` 
+* `nfs3_mkdir` 
+* `nfs3_symlink` 
+* `nfs3_remove` 
+* `nfs3_rmdir` 
+* `nfs3_rename` 
+* `nfs3_link` 
+* `nfs3_readdir` 
+* `nfs3_readdirplus` 
+* `nfs3_fsstat` 
+* `nfs3_fsinfo` 
+* `nfs3_pathconf` 
+* `nfs3_commit` 
+
--- a/collectors/nfs4Metric.md
+++ b/collectors/nfs4Metric.md
@@ -0,0 +1,62 @@
+
+## `nfs4stat` collector
+
+```json
+  "nfs4stat": {
+    "nfsstat" : "/path/to/nfsstat",
+    "exclude_metrics": [
+      "nfs4_total"
+    ]
+  }
+```
+
+The `nfs4stat` collector reads data from `nfsstat` command and outputs a handful **node** metrics. If a metric is not required, it can be excluded from forwarding it to the sink. There is currently no possibility to get the metrics per mount point.
+
+
+Metrics:
+* `nfs4_total` 
+* `nfs4_null` 
+* `nfs4_read` 
+* `nfs4_write` 
+* `nfs4_commit` 
+* `nfs4_open` 
+* `nfs4_open_conf` 
+* `nfs4_open_noat` 
+* `nfs4_open_dgrd` 
+* `nfs4_close` 
+* `nfs4_setattr` 
+* `nfs4_fsinfo` 
+* `nfs4_renew` 
+* `nfs4_setclntid` 
+* `nfs4_confirm` 
+* `nfs4_lock` 
+* `nfs4_lockt` 
+* `nfs4_locku` 
+* `nfs4_access` 
+* `nfs4_getattr` 
+* `nfs4_lookup` 
+* `nfs4_lookup_root` 
+* `nfs4_remove` 
+* `nfs4_rename` 
+* `nfs4_link` 
+* `nfs4_symlink` 
+* `nfs4_create` 
+* `nfs4_pathconf` 
+* `nfs4_statfs` 
+* `nfs4_readlink` 
+* `nfs4_readdir` 
+* `nfs4_server_caps` 
+* `nfs4_delegreturn` 
+* `nfs4_getacl` 
+* `nfs4_setacl` 
+* `nfs4_rel_lkowner` 
+* `nfs4_exchange_id` 
+* `nfs4_create_session` 
+* `nfs4_destroy_session` 
+* `nfs4_sequence` 
+* `nfs4_get_lease_time` 
+* `nfs4_reclaim_comp` 
+* `nfs4_secinfo_no` 
+* `nfs4_bind_conn_to_ses` 
+
+
--- a/collectors/nfsMetric.go
+++ b/collectors/nfsMetric.go
@@ -11,26 +11,32 @@ import (
 	"strings"
 	"time"

-	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
 )

+// First part contains the code for the general NfsCollector.
+// Later, the general NfsCollector is more limited to Nfs3- and Nfs4Collector.
+
+const NFSSTAT_EXEC = `nfsstat`
+
 type NfsCollectorData struct {
 	current int64
 	last    int64
 }

-type NfsCollector struct {
+type nfsCollector struct {
 	metricCollector
-	tags   map[string]string
-	config struct {
-		Nfsutils       string   `json:"nfsutils"`
+	tags    map[string]string
+	version string
+	config  struct {
+		Nfsstats       string   `json:"nfsstat"`
 		ExcludeMetrics []string `json:"exclude_metrics,omitempty"`
 	}
-	data map[string]map[string]NfsCollectorData
+	data map[string]NfsCollectorData
 }

-func (m *NfsCollector) initStats() error {
-	cmd := exec.Command(m.config.Nfsutils, "-l")
+func (m *nfsCollector) initStats() error {
+	cmd := exec.Command(m.config.Nfsstats, `-l`, `--all`)
 	cmd.Wait()
 	buffer, err := cmd.Output()
 	if err == nil {
@@ -39,17 +45,16 @@ func (m *NfsCollector) initStats() error {
 			if len(lf) != 5 {
 				continue
 			}
-			if _, exist := m.data[lf[1]]; !exist {
-				m.data[lf[1]] = make(map[string]NfsCollectorData)
-			}
-			name := strings.Trim(lf[3], ":")
-			if _, exist := m.data[lf[1]][name]; !exist {
-				value, err := strconv.ParseInt(lf[4], 0, 64)
-				if err == nil {
-					x := m.data[lf[1]][name]
-					x.current = value
-					x.last = 0
-					m.data[lf[1]][name] = x
+			if lf[1] == m.version {
+				name := strings.Trim(lf[3], ":")
+				if _, exist := m.data[name]; !exist {
+					value, err := strconv.ParseInt(lf[4], 0, 64)
+					if err == nil {
+						x := m.data[name]
+						x.current = value
+						x.last = value
+						m.data[name] = x
+					}
 				}
 			}
 		}
@@ -57,8 +62,8 @@ func (m *NfsCollector) initStats() error {
 	return err
 }

-func (m *NfsCollector) updateStats() error {
-	cmd := exec.Command(m.config.Nfsutils, "-l")
+func (m *nfsCollector) updateStats() error {
+	cmd := exec.Command(m.config.Nfsstats, `-l`, `--all`)
 	cmd.Wait()
 	buffer, err := cmd.Output()
 	if err == nil {
@@ -67,17 +72,16 @@ func (m *NfsCollector) updateStats() error {
 			if len(lf) != 5 {
 				continue
 			}
-			if _, exist := m.data[lf[1]]; !exist {
-				m.data[lf[1]] = make(map[string]NfsCollectorData)
-			}
-			name := strings.Trim(lf[3], ":")
-			if _, exist := m.data[lf[1]][name]; exist {
-				value, err := strconv.ParseInt(lf[4], 0, 64)
-				if err == nil {
-					x := m.data[lf[1]][name]
-					x.last = x.current
-					x.current = value
-					m.data[lf[1]][name] = x
+			if lf[1] == m.version {
+				name := strings.Trim(lf[3], ":")
+				if _, exist := m.data[name]; exist {
+					value, err := strconv.ParseInt(lf[4], 0, 64)
+					if err == nil {
+						x := m.data[name]
+						x.last = x.current
+						x.current = value
+						m.data[name] = x
+					}
 				}
 			}
 		}
@@ -85,17 +89,11 @@ func (m *NfsCollector) updateStats() error {
 	return err
 }

-func (m *NfsCollector) Init(config json.RawMessage) error {
-	var err error
-	m.name = "NfsCollector"
-	m.setup()
-
-	// Set default mmpmon binary
-	m.config.Nfsutils = "/usr/sbin/nfsstat"
-
+func (m *nfsCollector) MainInit(config json.RawMessage) error {
+	m.config.Nfsstats = string(NFSSTAT_EXEC)
 	// Read JSON configuration
 	if len(config) > 0 {
-		err = json.Unmarshal(config, &m.config)
+		err := json.Unmarshal(config, &m.config)
 		if err != nil {
 			log.Print(err.Error())
 			return err
@@ -108,40 +106,70 @@ func (m *NfsCollector) Init(config json.RawMessage) error {
 	m.tags = map[string]string{
 		"type": "node",
 	}
-	// Check if mmpmon is in executable search path
-	_, err = exec.LookPath(m.config.Nfsutils)
+	// Check if nfsstat is in executable search path
+	_, err := exec.LookPath(m.config.Nfsstats)
 	if err != nil {
-		return fmt.Errorf("NfsCollector.Init(): Failed to find nfsstat binary '%s': %v", m.config.Nfsutils, err)
+		return fmt.Errorf("NfsCollector.Init(): Failed to find nfsstat binary '%s': %v", m.config.Nfsstats, err)
 	}
-	m.data = make(map[string]map[string]NfsCollectorData)
+	m.data = make(map[string]NfsCollectorData)
 	m.initStats()
 	m.init = true
+	m.parallel = true
 	return nil
 }

-func (m *NfsCollector) Read(interval time.Duration, output chan lp.CCMetric) {
+func (m *nfsCollector) Read(interval time.Duration, output chan lp.CCMetric) {
 	if !m.init {
 		return
 	}
 	timestamp := time.Now()

 	m.updateStats()
+	prefix := ""
+	switch m.version {
+	case "v3":
+		prefix = "nfs3"
+	case "v4":
+		prefix = "nfs4"
+	default:
+		prefix = "nfs"
+	}

-	for version, metrics := range m.data {
-		for name, data := range metrics {
-			if _, skip := stringArrayContains(m.config.ExcludeMetrics, name); skip {
-				continue
-			}
-			value := data.current - data.last
-			y, err := lp.New(fmt.Sprintf("nfs_%s", name), m.tags, m.meta, map[string]interface{}{"value": value}, timestamp)
-			if err == nil {
-				y.AddMeta("version", version)
-				output <- y
-			}
+	for name, data := range m.data {
+		if _, skip := stringArrayContains(m.config.ExcludeMetrics, name); skip {
+			continue
+		}
+		value := data.current - data.last
+		y, err := lp.New(fmt.Sprintf("%s_%s", prefix, name), m.tags, m.meta, map[string]interface{}{"value": value}, timestamp)
+		if err == nil {
+			y.AddMeta("version", m.version)
+			output <- y
 		}
 	}
 }

-func (m *NfsCollector) Close() {
+func (m *nfsCollector) Close() {
 	m.init = false
 }
+
+type Nfs3Collector struct {
+	nfsCollector
+}
+
+type Nfs4Collector struct {
+	nfsCollector
+}
+
+func (m *Nfs3Collector) Init(config json.RawMessage) error {
+	m.name = "Nfs3Collector"
+	m.version = `v3`
+	m.setup()
+	return m.MainInit(config)
+}
+
+func (m *Nfs4Collector) Init(config json.RawMessage) error {
+	m.name = "Nfs4Collector"
+	m.version = `v4`
+	m.setup()
+	return m.MainInit(config)
+}
--- a/collectors/nfsiostatMetric.go
+++ b/collectors/nfsiostatMetric.go
@@ -0,0 +1,166 @@
+package collectors
+
+import (
+	"encoding/json"
+	"fmt"
+	"os"
+	"regexp"
+	"strconv"
+	"strings"
+	"time"
+
+	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
+)
+
+// These are the fields we read from the JSON configuration
+type NfsIOStatCollectorConfig struct {
+	ExcludeMetrics          []string `json:"exclude_metrics,omitempty"`
+	ExcludeFilesystem       []string `json:"exclude_filesystem,omitempty"`
+	UseServerAddressAsSType bool     `json:"use_server_as_stype,omitempty"`
+}
+
+// This contains all variables we need during execution and the variables
+// defined by metricCollector (name, init, ...)
+type NfsIOStatCollector struct {
+	metricCollector
+	config NfsIOStatCollectorConfig    // the configuration structure
+	meta   map[string]string           // default meta information
+	tags   map[string]string           // default tags
+	data   map[string]map[string]int64 // data storage for difference calculation
+	key    string                      // which device info should be used as subtype ID? 'server' or 'mntpoint', see NfsIOStatCollectorConfig.UseServerAddressAsSType
+}
+
+var deviceRegex = regexp.MustCompile(`device (?P<server>[^ ]+) mounted on (?P<mntpoint>[^ ]+) with fstype nfs(?P<version>\d*) statvers=[\d\.]+`)
+var bytesRegex = regexp.MustCompile(`\s+bytes:\s+(?P<nread>[^ ]+) (?P<nwrite>[^ ]+) (?P<dread>[^ ]+) (?P<dwrite>[^ ]+) (?P<nfsread>[^ ]+) (?P<nfswrite>[^ ]+) (?P<pageread>[^ ]+) (?P<pagewrite>[^ ]+)`)
+
+func resolve_regex_fields(s string, regex *regexp.Regexp) map[string]string {
+	fields := make(map[string]string)
+	groups := regex.SubexpNames()
+	for _, match := range regex.FindAllStringSubmatch(s, -1) {
+		for groupIdx, group := range match {
+			if len(groups[groupIdx]) > 0 {
+				fields[groups[groupIdx]] = group
+			}
+		}
+	}
+	return fields
+}
+
+func (m *NfsIOStatCollector) readNfsiostats() map[string]map[string]int64 {
+	data := make(map[string]map[string]int64)
+	filename := "/proc/self/mountstats"
+	stats, err := os.ReadFile(filename)
+	if err != nil {
+		return data
+	}
+
+	lines := strings.Split(string(stats), "\n")
+	var current map[string]string = nil
+	for _, l := range lines {
+		// Is this a device line with mount point, remote target and NFS version?
+		dev := resolve_regex_fields(l, deviceRegex)
+		if len(dev) > 0 {
+			if _, ok := stringArrayContains(m.config.ExcludeFilesystem, dev[m.key]); !ok {
+				current = dev
+				if len(current["version"]) == 0 {
+					current["version"] = "3"
+				}
+			}
+		}
+
+		if len(current) > 0 {
+			// Byte line parsing (if found the device for it)
+			bytes := resolve_regex_fields(l, bytesRegex)
+			if len(bytes) > 0 {
+				data[current[m.key]] = make(map[string]int64)
+				for name, sval := range bytes {
+					if _, ok := stringArrayContains(m.config.ExcludeMetrics, name); !ok {
+						val, err := strconv.ParseInt(sval, 10, 64)
+						if err == nil {
+							data[current[m.key]][name] = val
+						}
+					}
+
+				}
+				current = nil
+			}
+		}
+	}
+	return data
+}
+
+func (m *NfsIOStatCollector) Init(config json.RawMessage) error {
+	var err error = nil
+	m.name = "NfsIOStatCollector"
+	m.setup()
+	m.parallel = true
+	m.meta = map[string]string{"source": m.name, "group": "NFS", "unit": "bytes"}
+	m.tags = map[string]string{"type": "node"}
+	m.config.UseServerAddressAsSType = false
+	if len(config) > 0 {
+		err = json.Unmarshal(config, &m.config)
+		if err != nil {
+			cclog.ComponentError(m.name, "Error reading config:", err.Error())
+			return err
+		}
+	}
+	m.key = "mntpoint"
+	if m.config.UseServerAddressAsSType {
+		m.key = "server"
+	}
+	m.data = m.readNfsiostats()
+	m.init = true
+	return err
+}
+
+func (m *NfsIOStatCollector) Read(interval time.Duration, output chan lp.CCMetric) {
+	timestamp := time.Now()
+
+	// Get the current values for all mountpoints
+	newdata := m.readNfsiostats()
+
+	for mntpoint, values := range newdata {
+		// Was the mount point already present in the last iteration
+		if old, ok := m.data[mntpoint]; ok {
+			// Calculate the difference of old and new values
+			for i := range values {
+				x := values[i] - old[i]
+				y, err := lp.New(fmt.Sprintf("nfsio_%s", i), m.tags, m.meta, map[string]interface{}{"value": x}, timestamp)
+				if err == nil {
+					if strings.HasPrefix(i, "page") {
+						y.AddMeta("unit", "4K_Pages")
+					}
+					y.AddTag("stype", "filesystem")
+					y.AddTag("stype-id", mntpoint)
+					// Send it to output channel
+					output <- y
+				}
+				// Update old to the new value for the next iteration
+				old[i] = values[i]
+			}
+		} else {
+			// First time we see this mount point, store all values
+			m.data[mntpoint] = values
+		}
+	}
+	// Reset entries that do not exist anymore
+	for mntpoint := range m.data {
+		found := false
+		for new := range newdata {
+			if new == mntpoint {
+				found = true
+				break
+			}
+		}
+		if !found {
+			m.data[mntpoint] = nil
+		}
+	}
+
+}
+
+func (m *NfsIOStatCollector) Close() {
+	// Unset flag
+	m.init = false
+}
--- a/collectors/nfsiostatMetric.md
+++ b/collectors/nfsiostatMetric.md
@@ -0,0 +1,27 @@
+## `nfsiostat` collector
+
+```json
+  "nfsiostat": {
+    "exclude_metrics": [
+      "nfsio_oread"
+    ],
+    "exclude_filesystems" : [
+        "/mnt",
+    ],
+    "use_server_as_stype": false
+  }
+```
+
+The `nfsiostat` collector reads data from `/proc/self/mountstats` and outputs a handful **node** metrics for each NFS filesystem. If a metric or filesystem is not required, it can be excluded from forwarding it to the sink.
+
+Metrics:
+* `nfsio_nread`: Bytes transferred by normal `read()` calls
+* `nfsio_nwrite`: Bytes transferred by normal `write()` calls
+* `nfsio_oread`: Bytes transferred by `read()` calls with `O_DIRECT`
+* `nfsio_owrite`: Bytes transferred by `write()` calls with `O_DIRECT`
+* `nfsio_pageread`: Pages transferred by `read()` calls
+* `nfsio_pagewrite`: Pages transferred by `write()` calls
+* `nfsio_nfsread`: Bytes transferred for reading from the server
+* `nfsio_nfswrite`: Pages transferred by writing to the server
+
+The `nfsiostat` collector adds the mountpoint to the tags as `stype=filesystem,stype-id=<mountpoint>`. If the server address should be used instead of the mountpoint, use the `use_server_as_stype` config setting.
--- a/collectors/numastatsMetric.go
+++ b/collectors/numastatsMetric.go
@@ -0,0 +1,151 @@
+package collectors
+
+import (
+	"bufio"
+	"encoding/json"
+	"fmt"
+	"os"
+	"path/filepath"
+	"strconv"
+	"strings"
+	"time"
+
+	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
+)
+
+// Non-Uniform Memory Access (NUMA) policy hit/miss statistics
+//
+// numa_hit:
+//
+//	A process wanted to allocate memory from this node, and succeeded.
+//
+// numa_miss:
+//
+//	A process wanted to allocate memory from another node,
+//	but ended up with memory from this node.
+//
+// numa_foreign:
+//
+//	A process wanted to allocate on this node,
+//	but ended up with memory from another node.
+//
+// local_node:
+//
+//	A process ran on this node's CPU,
+//	and got memory from this node.
+//
+// other_node:
+//
+//	A process ran on a different node's CPU
+//	and got memory from this node.
+//
+// interleave_hit:
+//
+//	Interleaving wanted to allocate from this node
+//	and succeeded.
+//
+// See: https://www.kernel.org/doc/html/latest/admin-guide/numastat.html
+type NUMAStatsCollectorTopolgy struct {
+	file   string
+	tagSet map[string]string
+}
+
+type NUMAStatsCollector struct {
+	metricCollector
+	topology []NUMAStatsCollectorTopolgy
+}
+
+func (m *NUMAStatsCollector) Init(config json.RawMessage) error {
+	// Check if already initialized
+	if m.init {
+		return nil
+	}
+
+	m.name = "NUMAStatsCollector"
+	m.parallel = true
+	m.setup()
+	m.meta = map[string]string{
+		"source": m.name,
+		"group":  "NUMA",
+	}
+
+	// Loop for all NUMA node directories
+	base := "/sys/devices/system/node/node"
+	globPattern := base + "[0-9]*"
+	dirs, err := filepath.Glob(globPattern)
+	if err != nil {
+		return fmt.Errorf("unable to glob files with pattern '%s'", globPattern)
+	}
+	if dirs == nil {
+		return fmt.Errorf("unable to find any files with pattern '%s'", globPattern)
+	}
+	m.topology = make([]NUMAStatsCollectorTopolgy, 0, len(dirs))
+	for _, dir := range dirs {
+		node := strings.TrimPrefix(dir, base)
+		file := filepath.Join(dir, "numastat")
+		m.topology = append(m.topology,
+			NUMAStatsCollectorTopolgy{
+				file:   file,
+				tagSet: map[string]string{"memoryDomain": node},
+			})
+	}
+
+	// Initialized
+	cclog.ComponentDebug(m.name, "initialized", len(m.topology), "NUMA domains")
+	m.init = true
+	return nil
+}
+
+func (m *NUMAStatsCollector) Read(interval time.Duration, output chan lp.CCMetric) {
+	if !m.init {
+		return
+	}
+
+	for i := range m.topology {
+		// Loop for all NUMA domains
+		t := &m.topology[i]
+
+		now := time.Now()
+		file, err := os.Open(t.file)
+		if err != nil {
+			cclog.ComponentError(
+				m.name,
+				fmt.Sprintf("Read(): Failed to open file '%s': %v", t.file, err))
+			return
+		}
+		scanner := bufio.NewScanner(file)
+
+		// Read line by line
+		for scanner.Scan() {
+			split := strings.Fields(scanner.Text())
+			if len(split) != 2 {
+				continue
+			}
+			key := split[0]
+			value, err := strconv.ParseInt(split[1], 10, 64)
+			if err != nil {
+				cclog.ComponentError(
+					m.name,
+					fmt.Sprintf("Read(): Failed to convert %s='%s' to int64: %v", key, split[1], err))
+				continue
+			}
+			y, err := lp.New(
+				"numastats_"+key,
+				t.tagSet,
+				m.meta,
+				map[string]interface{}{"value": value},
+				now,
+			)
+			if err == nil {
+				output <- y
+			}
+		}
+
+		file.Close()
+	}
+}
+
+func (m *NUMAStatsCollector) Close() {
+	m.init = false
+}
--- a/collectors/numastatsMetric.md
+++ b/collectors/numastatsMetric.md
@@ -0,0 +1,17 @@
+
+## `numastat` collector
+
+```json
+  "numastats": {}
+```
+
+The `numastat` collector reads data from `/sys/devices/system/node/node*/numastat` and outputs a handful **memoryDomain** metrics. See: <https://www.kernel.org/doc/html/latest/admin-guide/numastat.html>
+
+Metrics:
+
+* `numastats_numa_hit`: A process wanted to allocate memory from this node, and succeeded.
+* `numastats_numa_miss`: A process wanted to allocate memory from another node, but ended up with memory from this node.
+* `numastats_numa_foreign`: A process wanted to allocate on this node, but ended up with memory from another node.
+* `numastats_local_node`: A process ran on this node's CPU, and got memory from this node.
+* `numastats_other_node`: A process ran on a different node's CPU, and got memory from this node.
+* `numastats_interleave_hit`: Interleaving wanted to allocate from this node and succeeded.
--- a/collectors/nvidiaMetric.go
+++ b/collectors/nvidiaMetric.go
--- a/collectors/nvidiaMetric.md
+++ b/collectors/nvidiaMetric.md
@@ -3,38 +3,74 @@

 ```json
  "nvidia": {
-    "exclude_devices" : [
-      "0","1"
+    "exclude_devices": [
+      "0","1", "0000000:ff:01.0"
    ],
    "exclude_metrics": [
-      "nv_fb_memory",
+      "nv_fb_mem_used",
      "nv_fan"
-    ]
+    ],
+    "process_mig_devices": false,
+    "use_pci_info_as_type_id": true,
+    "add_pci_info_tag": false,
+    "add_uuid_meta": false,
+    "add_board_number_meta": false,
+    "add_serial_meta": false,
+    "use_uuid_for_mig_device": false,
+    "use_slice_for_mig_device": false
  }
 ```

+The `nvidia` collector can be configured to leave out specific devices with the `exclude_devices` option. It takes IDs as supplied to the NVML with `nvmlDeviceGetHandleByIndex()` or the PCI address in NVML format (`%08X:%02X:%02X.0`). Metrics (listed below) that should not be sent to the MetricRouter can be excluded with the `exclude_metrics` option. Commonly only the physical GPUs are monitored. If MIG devices should be analyzed as well, set `process_mig_devices` (adds `stype=mig,stype-id=<mig_index>`). With the options `use_uuid_for_mig_device` and `use_slice_for_mig_device`, the `<mig_index>` can be replaced with the UUID (e.g. `MIG-6a9f7cc8-6d5b-5ce0-92de-750edc4d8849`) or the MIG slice name (e.g. `1g.5gb`).
+
+The metrics sent by the `nvidia` collector use `accelerator` as `type` tag. For the `type-id`, it uses the device handle index by default. With the `use_pci_info_as_type_id` option, the PCI ID is used instead. If both values should be added as tags, activate the `add_pci_info_tag` option. It uses the device handle index as `type-id` and adds the PCI ID as separate `pci_identifier` tag.
+
+Optionally, it is possible to add the UUID, the board part number and the serial to the meta informations. They are not sent to the sinks (if not configured otherwise).
+
+
 Metrics:
 * `nv_util`
 * `nv_mem_util`
-* `nv_mem_total`
-* `nv_fb_memory`
+* `nv_fb_mem_total`
+* `nv_fb_mem_used`
+* `nv_bar1_mem_total`
+* `nv_bar1_mem_used`
 * `nv_temp`
 * `nv_fan`
 * `nv_ecc_mode`
 * `nv_perf_state`
-* `nv_power_usage_report`
-* `nv_graphics_clock_report`
-* `nv_sm_clock_report`
-* `nv_mem_clock_report`
+* `nv_power_usage`
+* `nv_graphics_clock`
+* `nv_sm_clock`
+* `nv_mem_clock`
+* `nv_video_clock`
 * `nv_max_graphics_clock`
 * `nv_max_sm_clock`
 * `nv_max_mem_clock`
-* `nv_ecc_db_error`
-* `nv_ecc_sb_error`
-* `nv_power_man_limit`
+* `nv_max_video_clock`
+* `nv_ecc_uncorrected_error`
+* `nv_ecc_corrected_error`
+* `nv_power_max_limit`
 * `nv_encoder_util`
 * `nv_decoder_util`
+* `nv_remapped_rows_corrected`
+* `nv_remapped_rows_uncorrected`
+* `nv_remapped_rows_pending`
+* `nv_remapped_rows_failure`
+* `nv_compute_processes`
+* `nv_graphics_processes`
+* `nv_violation_power`
+* `nv_violation_thermal`
+* `nv_violation_sync_boost`
+* `nv_violation_board_limit`
+* `nv_violation_low_util`
+* `nv_violation_reliability`
+* `nv_violation_below_app_clock`
+* `nv_violation_below_base_clock`
+* `nv_nvlink_crc_flit_errors`
+* `nv_nvlink_crc_errors`
+* `nv_nvlink_ecc_errors`
+* `nv_nvlink_replay_errors`
+* `nv_nvlink_recovery_errors`

-It uses a separate `type` in the metrics. The output metric looks like this:
-`<name>,type=accelerator,type-id=<nvidia-gpu-id> value=<metric value> <timestamp>`
-
+Some metrics add the additional sub type tag (`stype`) like the `nv_nvlink_*` metrics set `stype=nvlink,stype-id=<link_number>`. 
--- a/collectors/raplMetric.go
+++ b/collectors/raplMetric.go
@@ -0,0 +1,262 @@
+package collectors
+
+import (
+	"encoding/json"
+	"fmt"
+	"os"
+	"path/filepath"
+	"strconv"
+	"strings"
+	"time"
+
+	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
+)
+
+// running average power limit (RAPL) monitoring attributes for a zone
+type RAPLZoneInfo struct {
+	// tags describing the RAPL zone:
+	// * zone_name, subzone_name: e.g. psys, dram, core, uncore, package-0
+	// * zone_id: e.g. 0:1 (zone 0 sub zone 1)
+	tags            map[string]string
+	energyFilepath  string    // path to a file containing the zones current energy counter in micro joules
+	energy          int64     // current reading of the energy counter in micro joules
+	energyTimestamp time.Time // timestamp when energy counter was read
+	maxEnergyRange  int64     // Range of the above energy counter in micro-joules
+}
+
+type RAPLCollector struct {
+	metricCollector
+	config struct {
+		// Exclude IDs for RAPL zones, e.g.
+		// * 0 for zone 0
+		// * 0:1 for zone 0 subzone 1
+		ExcludeByID []string `json:"exclude_device_by_id,omitempty"`
+		// Exclude names for RAPL zones, e.g. psys, dram, core, uncore, package-0
+		ExcludeByName []string `json:"exclude_device_by_name,omitempty"`
+	}
+	RAPLZoneInfo []RAPLZoneInfo
+	meta         map[string]string // default meta information
+}
+
+// Init initializes the running average power limit (RAPL) collector
+func (m *RAPLCollector) Init(config json.RawMessage) error {
+
+	// Check if already initialized
+	if m.init {
+		return nil
+	}
+
+	var err error = nil
+	m.name = "RAPLCollector"
+	m.setup()
+	m.parallel = true
+	m.meta = map[string]string{
+		"source": m.name,
+		"group":  "energy",
+		"unit":   "Watt",
+	}
+
+	// Read in the JSON configuration
+	if len(config) > 0 {
+		err = json.Unmarshal(config, &m.config)
+		if err != nil {
+			cclog.ComponentError(m.name, "Error reading config:", err.Error())
+			return err
+		}
+	}
+
+	// Configure excluded RAPL zones
+	isIDExcluded := make(map[string]bool)
+	if m.config.ExcludeByID != nil {
+		for _, ID := range m.config.ExcludeByID {
+			isIDExcluded[ID] = true
+		}
+	}
+	isNameExcluded := make(map[string]bool)
+	if m.config.ExcludeByName != nil {
+		for _, name := range m.config.ExcludeByName {
+			isNameExcluded[name] = true
+		}
+	}
+
+	// readZoneInfo reads RAPL monitoring attributes for a zone given by zonePath
+	// See: https://www.kernel.org/doc/html/latest/power/powercap/powercap.html#monitoring-attributes
+	readZoneInfo := func(zonePath string) (z struct {
+		name            string    // zones name e.g. psys, dram, core, uncore, package-0
+		energyFilepath  string    // path to a file containing the zones current energy counter in micro joules
+		energy          int64     // current reading of the energy counter in micro joules
+		energyTimestamp time.Time // timestamp when energy counter was read
+		maxEnergyRange  int64     // Range of the above energy counter in micro-joules
+		ok              bool      // Are all information available?
+	}) {
+		// zones name e.g. psys, dram, core, uncore, package-0
+		foundName := false
+		if v, err :=
+			os.ReadFile(
+				filepath.Join(zonePath, "name")); err == nil {
+			foundName = true
+			z.name = strings.TrimSpace(string(v))
+		}
+
+		// path to a file containing the zones current energy counter in micro joules
+		z.energyFilepath = filepath.Join(zonePath, "energy_uj")
+
+		// current reading of the energy counter in micro joules
+		foundEnergy := false
+		if v, err := os.ReadFile(z.energyFilepath); err == nil {
+			// timestamp when energy counter was read
+			z.energyTimestamp = time.Now()
+			if i, err := strconv.ParseInt(strings.TrimSpace(string(v)), 10, 64); err == nil {
+				foundEnergy = true
+				z.energy = i
+			}
+		}
+
+		// Range of the above energy counter in micro-joules
+		foundMaxEnergyRange := false
+		if v, err :=
+			os.ReadFile(
+				filepath.Join(zonePath, "max_energy_range_uj")); err == nil {
+			if i, err := strconv.ParseInt(strings.TrimSpace(string(v)), 10, 64); err == nil {
+				foundMaxEnergyRange = true
+				z.maxEnergyRange = i
+			}
+		}
+
+		// Are all information available?
+		z.ok = foundName && foundEnergy && foundMaxEnergyRange
+
+		return
+	}
+
+	powerCapPrefix := "/sys/devices/virtual/powercap"
+	controlType := "intel-rapl"
+	controlTypePath := filepath.Join(powerCapPrefix, controlType)
+
+	// Find all RAPL zones
+	zonePrefix := filepath.Join(controlTypePath, controlType+":")
+	zonesPath, err := filepath.Glob(zonePrefix + "*")
+	if err != nil || zonesPath == nil {
+		return fmt.Errorf("unable to find any zones under %s", controlTypePath)
+	}
+
+	for _, zonePath := range zonesPath {
+		zoneID := strings.TrimPrefix(zonePath, zonePrefix)
+		z := readZoneInfo(zonePath)
+		if z.ok &&
+			!isIDExcluded[zoneID] &&
+			!isNameExcluded[z.name] {
+
+			// Add RAPL monitoring attributes for a zone
+			m.RAPLZoneInfo =
+				append(
+					m.RAPLZoneInfo,
+					RAPLZoneInfo{
+						tags: map[string]string{
+							"id":        zoneID,
+							"zone_name": z.name,
+						},
+						energyFilepath:  z.energyFilepath,
+						energy:          z.energy,
+						energyTimestamp: z.energyTimestamp,
+						maxEnergyRange:  z.maxEnergyRange,
+					})
+		}
+
+		// find all sub zones for the given zone
+		subZonePrefix := filepath.Join(zonePath, controlType+":"+zoneID+":")
+		subZonesPath, err := filepath.Glob(subZonePrefix + "*")
+		if err != nil || subZonesPath == nil {
+			continue
+		}
+
+		for _, subZonePath := range subZonesPath {
+			subZoneID := strings.TrimPrefix(subZonePath, subZonePrefix)
+			sz := readZoneInfo(subZonePath)
+			if len(zoneID) > 0 && len(z.name) > 0 &&
+				sz.ok &&
+				!isIDExcluded[zoneID+":"+subZoneID] &&
+				!isNameExcluded[sz.name] {
+				m.RAPLZoneInfo =
+					append(
+						m.RAPLZoneInfo,
+						RAPLZoneInfo{
+							tags: map[string]string{
+								"id":            zoneID + ":" + subZoneID,
+								"zone_name":     z.name,
+								"sub_zone_name": sz.name,
+							},
+							energyFilepath:  sz.energyFilepath,
+							energy:          sz.energy,
+							energyTimestamp: sz.energyTimestamp,
+							maxEnergyRange:  sz.maxEnergyRange,
+						})
+			}
+		}
+	}
+
+	if m.RAPLZoneInfo == nil {
+		return fmt.Errorf("no running average power limit (RAPL) device found in %s", controlTypePath)
+
+	}
+
+	// Initialized
+	cclog.ComponentDebug(
+		m.name,
+		"initialized",
+		len(m.RAPLZoneInfo),
+		"zones with running average power limit (RAPL) monitoring attributes")
+	m.init = true
+
+	return err
+}
+
+// Read reads running average power limit (RAPL) monitoring attributes for all initialized zones
+// See: https://www.kernel.org/doc/html/latest/power/powercap/powercap.html#monitoring-attributes
+func (m *RAPLCollector) Read(interval time.Duration, output chan lp.CCMetric) {
+
+	for i := range m.RAPLZoneInfo {
+		p := &m.RAPLZoneInfo[i]
+
+		// Read current value of the energy counter in micro joules
+		if v, err := os.ReadFile(p.energyFilepath); err == nil {
+			energyTimestamp := time.Now()
+			if i, err := strconv.ParseInt(strings.TrimSpace(string(v)), 10, 64); err == nil {
+				energy := i
+
+				// Compute average power (Δ energy / Δ time)
+				energyDiff := energy - p.energy
+				if energyDiff < 0 {
+					// Handle overflow:
+					// ( p.maxEnergyRange - p.energy ) + energy
+					// = p.maxEnergyRange + ( energy - p.energy )
+					// = p.maxEnergyRange + diffEnergy
+					energyDiff += p.maxEnergyRange
+				}
+				timeDiff := energyTimestamp.Sub(p.energyTimestamp)
+				averagePower := float64(energyDiff) / float64(timeDiff.Microseconds())
+
+				y, err := lp.New(
+					"rapl_average_power",
+					p.tags,
+					m.meta,
+					map[string]interface{}{"value": averagePower},
+					energyTimestamp)
+				if err == nil {
+					output <- y
+				}
+
+				// Save current energy counter state
+				p.energy = energy
+				p.energyTimestamp = energyTimestamp
+			}
+		}
+	}
+}
+
+// Close closes running average power limit (RAPL) metric collector
+func (m *RAPLCollector) Close() {
+	// Unset flag
+	m.init = false
+}
--- a/collectors/raplMetric.md
+++ b/collectors/raplMetric.md
@@ -0,0 +1,18 @@
+# Running average power limit (RAPL) metric collector
+
+This collector reads running average power limit (RAPL) monitoring attributes to compute average power consumption metrics. See <https://www.kernel.org/doc/html/latest/power/powercap/powercap.html#monitoring-attributes>.
+
+The Likwid metric collector provides similar functionality.
+
+## Configuration
+
+```json
+  "rapl": {
+    "exclude_device_by_id": ["0:1", "0:2"],
+    "exclude_device_by_name": ["psys"]
+  }
+```
+
+## Metrics
+
+* `rapl_average_power`: average power consumption in Watt. The average is computed over the entire runtime from the last measurement to the current measurement
--- a/collectors/rocmsmiMetric.go
+++ b/collectors/rocmsmiMetric.go
@@ -0,0 +1,319 @@
+package collectors
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"time"
+
+	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
+	"github.com/ClusterCockpit/go-rocm-smi/pkg/rocm_smi"
+)
+
+type RocmSmiCollectorConfig struct {
+	ExcludeMetrics     []string `json:"exclude_metrics,omitempty"`
+	ExcludeDevices     []string `json:"exclude_devices,omitempty"`
+	AddPciInfoTag      bool     `json:"add_pci_info_tag,omitempty"`
+	UsePciInfoAsTypeId bool     `json:"use_pci_info_as_type_id,omitempty"`
+	AddSerialMeta      bool     `json:"add_serial_meta,omitempty"`
+}
+
+type RocmSmiCollectorDevice struct {
+	device         rocm_smi.DeviceHandle
+	index          int
+	tags           map[string]string // default tags
+	meta           map[string]string // default meta information
+	excludeMetrics map[string]bool   // copy of exclude metrics from config
+}
+
+type RocmSmiCollector struct {
+	metricCollector
+	config  RocmSmiCollectorConfig // the configuration structure
+	devices []RocmSmiCollectorDevice
+}
+
+// Functions to implement MetricCollector interface
+// Init(...), Read(...), Close()
+// See: metricCollector.go
+
+// Init initializes the sample collector
+// Called once by the collector manager
+// All tags, meta data tags and metrics that do not change over the runtime should be set here
+func (m *RocmSmiCollector) Init(config json.RawMessage) error {
+	var err error = nil
+	// Always set the name early in Init() to use it in cclog.Component* functions
+	m.name = "RocmSmiCollector"
+	// This is for later use, also call it early
+	m.setup()
+	// Define meta information sent with each metric
+	// (Can also be dynamic or this is the basic set with extension through AddMeta())
+	//m.meta = map[string]string{"source": m.name, "group": "AMD"}
+	// Define tags sent with each metric
+	// The 'type' tag is always needed, it defines the granulatity of the metric
+	// node -> whole system
+	// socket -> CPU socket (requires socket ID as 'type-id' tag)
+	// cpu -> single CPU hardware thread (requires cpu ID as 'type-id' tag)
+	//m.tags = map[string]string{"type": "node"}
+	// Read in the JSON configuration
+	if len(config) > 0 {
+		err = json.Unmarshal(config, &m.config)
+		if err != nil {
+			cclog.ComponentError(m.name, "Error reading config:", err.Error())
+			return err
+		}
+	}
+
+	ret := rocm_smi.Init()
+	if ret != rocm_smi.STATUS_SUCCESS {
+		err = errors.New("failed to initialize ROCm SMI library")
+		cclog.ComponentError(m.name, err.Error())
+		return err
+	}
+
+	numDevs, ret := rocm_smi.NumMonitorDevices()
+	if ret != rocm_smi.STATUS_SUCCESS {
+		err = errors.New("failed to get number of GPUs from ROCm SMI library")
+		cclog.ComponentError(m.name, err.Error())
+		return err
+	}
+
+	exclDev := func(s string) bool {
+		skip_device := false
+		for _, excl := range m.config.ExcludeDevices {
+			if excl == s {
+				skip_device = true
+				break
+			}
+		}
+		return skip_device
+	}
+
+	m.devices = make([]RocmSmiCollectorDevice, 0)
+
+	for i := 0; i < numDevs; i++ {
+		str_i := fmt.Sprintf("%d", i)
+		if exclDev(str_i) {
+			continue
+		}
+		device, ret := rocm_smi.DeviceGetHandleByIndex(i)
+		if ret != rocm_smi.STATUS_SUCCESS {
+			err = fmt.Errorf("failed to get handle for GPU %d", i)
+			cclog.ComponentError(m.name, err.Error())
+			return err
+		}
+
+		pciInfo, ret := rocm_smi.DeviceGetPciInfo(device)
+		if ret != rocm_smi.STATUS_SUCCESS {
+			err = fmt.Errorf("failed to get PCI information for GPU %d", i)
+			cclog.ComponentError(m.name, err.Error())
+			return err
+		}
+
+		pciId := fmt.Sprintf(
+			"%08X:%02X:%02X.%X",
+			pciInfo.Domain,
+			pciInfo.Bus,
+			pciInfo.Device,
+			pciInfo.Function)
+
+		if exclDev(pciId) {
+			continue
+		}
+
+		dev := RocmSmiCollectorDevice{
+			device: device,
+			tags: map[string]string{
+				"type":    "accelerator",
+				"type-id": str_i,
+			},
+			meta: map[string]string{
+				"source": m.name,
+				"group":  "AMD",
+			},
+		}
+		if m.config.UsePciInfoAsTypeId {
+			dev.tags["type-id"] = pciId
+		} else if m.config.AddPciInfoTag {
+			dev.tags["pci_identifier"] = pciId
+		}
+
+		if m.config.AddSerialMeta {
+			serial, ret := rocm_smi.DeviceGetSerialNumber(device)
+			if ret != rocm_smi.STATUS_SUCCESS {
+				cclog.ComponentError(m.name, "Unable to get serial number for device at index", i, ":", rocm_smi.StatusStringNoError(ret))
+			} else {
+				dev.meta["serial"] = serial
+			}
+		}
+		// Add excluded metrics
+		dev.excludeMetrics = map[string]bool{}
+		for _, e := range m.config.ExcludeMetrics {
+			dev.excludeMetrics[e] = true
+		}
+		dev.index = i
+		m.devices = append(m.devices, dev)
+	}
+
+	// Set this flag only if everything is initialized properly, all required files exist, ...
+	m.init = true
+	return err
+}
+
+// Read collects all metrics belonging to the sample collector
+// and sends them through the output channel to the collector manager
+func (m *RocmSmiCollector) Read(interval time.Duration, output chan lp.CCMetric) {
+	// Create a sample metric
+	timestamp := time.Now()
+
+	for _, dev := range m.devices {
+		metrics, ret := rocm_smi.DeviceGetMetrics(dev.device)
+		if ret != rocm_smi.STATUS_SUCCESS {
+			cclog.ComponentError(m.name, "Unable to get metrics for device at index", dev.index, ":", rocm_smi.StatusStringNoError(ret))
+			continue
+		}
+
+		if !dev.excludeMetrics["rocm_gfx_util"] {
+			value := metrics.Average_gfx_activity
+			y, err := lp.New("rocm_gfx_util", dev.tags, dev.meta, map[string]interface{}{"value": value}, timestamp)
+			if err == nil {
+				output <- y
+			}
+		}
+		if !dev.excludeMetrics["rocm_umc_util"] {
+			value := metrics.Average_umc_activity
+			y, err := lp.New("rocm_umc_util", dev.tags, dev.meta, map[string]interface{}{"value": value}, timestamp)
+			if err == nil {
+				output <- y
+			}
+		}
+		if !dev.excludeMetrics["rocm_mm_util"] {
+			value := metrics.Average_mm_activity
+			y, err := lp.New("rocm_mm_util", dev.tags, dev.meta, map[string]interface{}{"value": value}, timestamp)
+			if err == nil {
+				output <- y
+			}
+		}
+		if !dev.excludeMetrics["rocm_avg_power"] {
+			value := metrics.Average_socket_power
+			y, err := lp.New("rocm_avg_power", dev.tags, dev.meta, map[string]interface{}{"value": value}, timestamp)
+			if err == nil {
+				output <- y
+			}
+		}
+		if !dev.excludeMetrics["rocm_temp_mem"] {
+			value := metrics.Temperature_mem
+			y, err := lp.New("rocm_temp_mem", dev.tags, dev.meta, map[string]interface{}{"value": value}, timestamp)
+			if err == nil {
+				output <- y
+			}
+		}
+		if !dev.excludeMetrics["rocm_temp_hotspot"] {
+			value := metrics.Temperature_hotspot
+			y, err := lp.New("rocm_temp_hotspot", dev.tags, dev.meta, map[string]interface{}{"value": value}, timestamp)
+			if err == nil {
+				output <- y
+			}
+		}
+		if !dev.excludeMetrics["rocm_temp_edge"] {
+			value := metrics.Temperature_edge
+			y, err := lp.New("rocm_temp_edge", dev.tags, dev.meta, map[string]interface{}{"value": value}, timestamp)
+			if err == nil {
+				output <- y
+			}
+		}
+		if !dev.excludeMetrics["rocm_temp_vrgfx"] {
+			value := metrics.Temperature_vrgfx
+			y, err := lp.New("rocm_temp_vrgfx", dev.tags, dev.meta, map[string]interface{}{"value": value}, timestamp)
+			if err == nil {
+				output <- y
+			}
+		}
+		if !dev.excludeMetrics["rocm_temp_vrsoc"] {
+			value := metrics.Temperature_vrsoc
+			y, err := lp.New("rocm_temp_vrsoc", dev.tags, dev.meta, map[string]interface{}{"value": value}, timestamp)
+			if err == nil {
+				output <- y
+			}
+		}
+		if !dev.excludeMetrics["rocm_temp_vrmem"] {
+			value := metrics.Temperature_vrmem
+			y, err := lp.New("rocm_temp_vrmem", dev.tags, dev.meta, map[string]interface{}{"value": value}, timestamp)
+			if err == nil {
+				output <- y
+			}
+		}
+		if !dev.excludeMetrics["rocm_gfx_clock"] {
+			value := metrics.Average_gfxclk_frequency
+			y, err := lp.New("rocm_gfx_clock", dev.tags, dev.meta, map[string]interface{}{"value": value}, timestamp)
+			if err == nil {
+				output <- y
+			}
+		}
+		if !dev.excludeMetrics["rocm_soc_clock"] {
+			value := metrics.Average_socclk_frequency
+			y, err := lp.New("rocm_soc_clock", dev.tags, dev.meta, map[string]interface{}{"value": value}, timestamp)
+			if err == nil {
+				output <- y
+			}
+		}
+		if !dev.excludeMetrics["rocm_u_clock"] {
+			value := metrics.Average_uclk_frequency
+			y, err := lp.New("rocm_u_clock", dev.tags, dev.meta, map[string]interface{}{"value": value}, timestamp)
+			if err == nil {
+				output <- y
+			}
+		}
+		if !dev.excludeMetrics["rocm_v0_clock"] {
+			value := metrics.Average_vclk0_frequency
+			y, err := lp.New("rocm_v0_clock", dev.tags, dev.meta, map[string]interface{}{"value": value}, timestamp)
+			if err == nil {
+				output <- y
+			}
+		}
+		if !dev.excludeMetrics["rocm_v1_clock"] {
+			value := metrics.Average_vclk1_frequency
+			y, err := lp.New("rocm_v1_clock", dev.tags, dev.meta, map[string]interface{}{"value": value}, timestamp)
+			if err == nil {
+				output <- y
+			}
+		}
+		if !dev.excludeMetrics["rocm_d0_clock"] {
+			value := metrics.Average_dclk0_frequency
+			y, err := lp.New("rocm_d0_clock", dev.tags, dev.meta, map[string]interface{}{"value": value}, timestamp)
+			if err == nil {
+				output <- y
+			}
+		}
+		if !dev.excludeMetrics["rocm_d1_clock"] {
+			value := metrics.Average_dclk1_frequency
+			y, err := lp.New("rocm_d1_clock", dev.tags, dev.meta, map[string]interface{}{"value": value}, timestamp)
+			if err == nil {
+				output <- y
+			}
+		}
+		if !dev.excludeMetrics["rocm_temp_hbm"] {
+			for i := 0; i < rocm_smi.NUM_HBM_INSTANCES; i++ {
+				value := metrics.Temperature_hbm[i]
+				y, err := lp.New("rocm_temp_hbm", dev.tags, dev.meta, map[string]interface{}{"value": value}, timestamp)
+				if err == nil {
+					y.AddTag("stype", "device")
+					y.AddTag("stype-id", fmt.Sprintf("%d", i))
+					output <- y
+				}
+			}
+		}
+	}
+
+}
+
+// Close metric collector: close network connection, close files, close libraries, ...
+// Called once by the collector manager
+func (m *RocmSmiCollector) Close() {
+	// Unset flag
+	ret := rocm_smi.Shutdown()
+	if ret != rocm_smi.STATUS_SUCCESS {
+		cclog.ComponentError(m.name, "Failed to shutdown ROCm SMI library")
+	}
+	m.init = false
+}
--- a/collectors/rocmsmiMetric.md
+++ b/collectors/rocmsmiMetric.md
@@ -0,0 +1,47 @@
+
+## `rocm_smi` collector
+
+```json
+  "rocm_smi": {
+    "exclude_devices": [
+      "0","1", "0000000:ff:01.0"
+    ],
+    "exclude_metrics": [
+      "rocm_mm_util",
+      "rocm_temp_vrsoc"
+    ],
+    "use_pci_info_as_type_id": true,
+    "add_pci_info_tag": false,
+    "add_serial_meta": false,
+  }
+```
+
+The `rocm_smi` collector can be configured to leave out specific devices with the `exclude_devices` option. It takes logical IDs in the list of available devices or the PCI address similar to NVML format (`%08X:%02X:%02X.0`). Metrics (listed below) that should not be sent to the MetricRouter can be excluded with the `exclude_metrics` option. 
+
+The metrics sent by the `rocm_smi` collector use `accelerator` as `type` tag. For the `type-id`, it uses the device handle index by default. With the `use_pci_info_as_type_id` option, the PCI ID is used instead. If both values should be added as tags, activate the `add_pci_info_tag` option. It uses the device handle index as `type-id` and adds the PCI ID as separate `pci_identifier` tag.
+
+Optionally, it is possible to add the serial to the meta informations. They are not sent to the sinks (if not configured otherwise).
+
+
+Metrics:
+* `rocm_gfx_util`
+* `rocm_umc_util`
+* `rocm_mm_util`
+* `rocm_avg_power`
+* `rocm_temp_mem`
+* `rocm_temp_hotspot`
+* `rocm_temp_edge`
+* `rocm_temp_vrgfx`
+* `rocm_temp_vrsoc`
+* `rocm_temp_vrmem`
+* `rocm_gfx_clock`
+* `rocm_soc_clock`
+* `rocm_u_clock`
+* `rocm_v0_clock`
+* `rocm_v1_clock`
+* `rocm_d0_clock`
+* `rocm_d1_clock`
+* `rocm_temp_hbm`
+
+
+Some metrics add the additional sub type tag (`stype`) like the `rocm_temp_hbm` metrics set `stype=device,stype-id=<HBM_slice_number>`. 
--- a/collectors/sampleMetric.go
+++ b/collectors/sampleMetric.go
@@ -0,0 +1,101 @@
+package collectors
+
+import (
+	"encoding/json"
+	"time"
+
+	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
+)
+
+// These are the fields we read from the JSON configuration
+type SampleCollectorConfig struct {
+	Interval string `json:"interval"`
+}
+
+// This contains all variables we need during execution and the variables
+// defined by metricCollector (name, init, ...)
+type SampleCollector struct {
+	metricCollector
+	config SampleCollectorConfig // the configuration structure
+	meta   map[string]string     // default meta information
+	tags   map[string]string     // default tags
+}
+
+// Functions to implement MetricCollector interface
+// Init(...), Read(...), Close()
+// See: metricCollector.go
+
+// Init initializes the sample collector
+// Called once by the collector manager
+// All tags, meta data tags and metrics that do not change over the runtime should be set here
+func (m *SampleCollector) Init(config json.RawMessage) error {
+	var err error = nil
+	// Always set the name early in Init() to use it in cclog.Component* functions
+	m.name = "InternalCollector"
+	// This is for later use, also call it early
+	m.setup()
+	// Tell whether the collector should be run in parallel with others (reading files, ...)
+	// or it should be run serially, mostly for collectors actually doing measurements
+	// because they should not measure the execution of the other collectors
+	m.parallel = true
+	// Define meta information sent with each metric
+	// (Can also be dynamic or this is the basic set with extension through AddMeta())
+	m.meta = map[string]string{"source": m.name, "group": "SAMPLE"}
+	// Define tags sent with each metric
+	// The 'type' tag is always needed, it defines the granularity of the metric
+	// node -> whole system
+	// socket -> CPU socket (requires socket ID as 'type-id' tag)
+	// die -> CPU die (requires CPU die ID as 'type-id' tag)
+	// memoryDomain -> NUMA domain (requires NUMA domain ID as 'type-id' tag)
+	// llc -> Last level cache (requires last level cache ID as 'type-id' tag)
+	// core -> single CPU core that may consist of multiple hardware threads (SMT) (requires core ID as 'type-id' tag)
+	// hwthtread -> single CPU hardware thread (requires hardware thread ID as 'type-id' tag)
+	// accelerator -> A accelerator device like GPU or FPGA (requires an accelerator ID as 'type-id' tag)
+	m.tags = map[string]string{"type": "node"}
+	// Read in the JSON configuration
+	if len(config) > 0 {
+		err = json.Unmarshal(config, &m.config)
+		if err != nil {
+			cclog.ComponentError(m.name, "Error reading config:", err.Error())
+			return err
+		}
+	}
+
+	// Set up everything that the collector requires during the Read() execution
+	// Check files required, test execution of some commands, create data structure
+	// for all topological entities (sockets, NUMA domains, ...)
+	// Return some useful error message in case of any failures
+
+	// Set this flag only if everything is initialized properly, all required files exist, ...
+	m.init = true
+	return err
+}
+
+// Read collects all metrics belonging to the sample collector
+// and sends them through the output channel to the collector manager
+func (m *SampleCollector) Read(interval time.Duration, output chan lp.CCMetric) {
+	// Create a sample metric
+	timestamp := time.Now()
+
+	value := 1.0
+	// If you want to measure something for a specific amount of time, use interval
+	// start := readState()
+	// time.Sleep(interval)
+	// stop := readState()
+	// value = (stop - start) / interval.Seconds()
+
+	y, err := lp.New("sample_metric", m.tags, m.meta, map[string]interface{}{"value": value}, timestamp)
+	if err == nil {
+		// Send it to output channel
+		output <- y
+	}
+
+}
+
+// Close metric collector: close network connection, close files, close libraries, ...
+// Called once by the collector manager
+func (m *SampleCollector) Close() {
+	// Unset flag
+	m.init = false
+}
--- a/collectors/sampleTimerMetric.go
+++ b/collectors/sampleTimerMetric.go
@@ -0,0 +1,122 @@
+package collectors
+
+import (
+	"encoding/json"
+	"sync"
+	"time"
+
+	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
+)
+
+// These are the fields we read from the JSON configuration
+type SampleTimerCollectorConfig struct {
+	Interval string `json:"interval"`
+}
+
+// This contains all variables we need during execution and the variables
+// defined by metricCollector (name, init, ...)
+type SampleTimerCollector struct {
+	metricCollector
+	wg       sync.WaitGroup             // sync group for management
+	done     chan bool                  // channel for management
+	meta     map[string]string          // default meta information
+	tags     map[string]string          // default tags
+	config   SampleTimerCollectorConfig // the configuration structure
+	interval time.Duration              // the interval parsed from configuration
+	ticker   *time.Ticker               // own timer
+	output   chan lp.CCMetric           // own internal output channel
+}
+
+func (m *SampleTimerCollector) Init(name string, config json.RawMessage) error {
+	var err error = nil
+	// Always set the name early in Init() to use it in cclog.Component* functions
+	m.name = "SampleTimerCollector"
+	// This is for later use, also call it early
+	m.setup()
+	// Define meta information sent with each metric
+	// (Can also be dynamic or this is the basic set with extension through AddMeta())
+	m.meta = map[string]string{"source": m.name, "group": "SAMPLE"}
+	// Define tags sent with each metric
+	// The 'type' tag is always needed, it defines the granularity of the metric
+	// node -> whole system
+	// socket -> CPU socket (requires socket ID as 'type-id' tag)
+	// cpu -> single CPU hardware thread (requires cpu ID as 'type-id' tag)
+	m.tags = map[string]string{"type": "node"}
+	// Read in the JSON configuration
+	if len(config) > 0 {
+		err = json.Unmarshal(config, &m.config)
+		if err != nil {
+			cclog.ComponentError(m.name, "Error reading config:", err.Error())
+			return err
+		}
+	}
+	// Parse the read interval duration
+	m.interval, err = time.ParseDuration(m.config.Interval)
+	if err != nil {
+		cclog.ComponentError(m.name, "Error parsing interval:", err.Error())
+		return err
+	}
+
+	// Storage for output channel
+	m.output = nil
+	// Management channel for the timer function.
+	m.done = make(chan bool)
+	// Create the own ticker
+	m.ticker = time.NewTicker(m.interval)
+
+	// Start the timer loop with return functionality by sending 'true' to the done channel
+	m.wg.Add(1)
+	go func() {
+		select {
+		case <-m.done:
+			// Exit the timer loop
+			cclog.ComponentDebug(m.name, "Closing...")
+			m.wg.Done()
+			return
+		case timestamp := <-m.ticker.C:
+			// This is executed every timer tick but we have to wait until the first
+			// Read() to get the output channel
+			if m.output != nil {
+				m.ReadMetrics(timestamp)
+			}
+		}
+	}()
+
+	// Set this flag only if everything is initialized properly, all required files exist, ...
+	m.init = true
+	return err
+}
+
+// This function is called at each interval timer tick
+func (m *SampleTimerCollector) ReadMetrics(timestamp time.Time) {
+	// Create a sample metric
+
+	value := 1.0
+
+	// If you want to measure something for a specific amount of time, use interval
+	// start := readState()
+	// time.Sleep(interval)
+	// stop := readState()
+	// value = (stop - start) / interval.Seconds()
+
+	y, err := lp.New("sample_metric", m.tags, m.meta, map[string]interface{}{"value": value}, timestamp)
+	if err == nil && m.output != nil {
+		// Send it to output channel if we have a valid channel
+		m.output <- y
+	}
+}
+
+func (m *SampleTimerCollector) Read(interval time.Duration, output chan lp.CCMetric) {
+	// Capture output channel
+	m.output = output
+}
+
+func (m *SampleTimerCollector) Close() {
+	// Send signal to the timer loop to stop it
+	m.done <- true
+	// Wait until the timer loop is done
+	m.wg.Wait()
+	// Unset flag
+	m.init = false
+}
--- a/collectors/schedstatMetric.go
+++ b/collectors/schedstatMetric.go
@@ -0,0 +1,154 @@
+package collectors
+
+import (
+	"bufio"
+	"encoding/json"
+	"fmt"
+	"math"
+	"os"
+	"strconv"
+	"strings"
+	"time"
+
+	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
+)
+
+const SCHEDSTATFILE = `/proc/schedstat`
+
+// These are the fields we read from the JSON configuration
+type SchedstatCollectorConfig struct {
+	ExcludeMetrics []string `json:"exclude_metrics,omitempty"`
+}
+
+// This contains all variables we need during execution and the variables
+// defined by metricCollector (name, init, ...)
+type SchedstatCollector struct {
+	metricCollector
+	config        SchedstatCollectorConfig     // the configuration structure
+	lastTimestamp time.Time                    // Store time stamp of last tick to derive values
+	meta          map[string]string            // default meta information
+	cputags       map[string]map[string]string // default tags
+	olddata       map[string]map[string]int64  // default tags
+}
+
+// Functions to implement MetricCollector interface
+// Init(...), Read(...), Close()
+// See: metricCollector.go
+
+// Init initializes the sample collector
+// Called once by the collector manager
+// All tags, meta data tags and metrics that do not change over the runtime should be set here
+func (m *SchedstatCollector) Init(config json.RawMessage) error {
+	var err error = nil
+	// Always set the name early in Init() to use it in cclog.Component* functions
+	m.name = "SchedstatCollector"
+	// This is for later use, also call it early
+	m.setup()
+	// Tell whether the collector should be run in parallel with others (reading files, ...)
+	// or it should be run serially, mostly for collectors acutally doing measurements
+	// because they should not measure the execution of the other collectors
+	m.parallel = true
+	// Define meta information sent with each metric
+	// (Can also be dynamic or this is the basic set with extension through AddMeta())
+	m.meta = map[string]string{"source": m.name, "group": "SCHEDSTAT"}
+
+	// Read in the JSON configuration
+	if len(config) > 0 {
+		err = json.Unmarshal(config, &m.config)
+		if err != nil {
+			cclog.ComponentError(m.name, "Error reading config:", err.Error())
+			return err
+		}
+	}
+
+	// Check input file
+	file, err := os.Open(string(SCHEDSTATFILE))
+	if err != nil {
+		cclog.ComponentError(m.name, err.Error())
+	}
+	defer file.Close()
+
+	// Pre-generate tags for all CPUs
+	num_cpus := 0
+	m.cputags = make(map[string]map[string]string)
+	m.olddata = make(map[string]map[string]int64)
+	scanner := bufio.NewScanner(file)
+	for scanner.Scan() {
+		line := scanner.Text()
+		linefields := strings.Fields(line)
+		if strings.HasPrefix(linefields[0], "cpu") && strings.Compare(linefields[0], "cpu") != 0 {
+			cpustr := strings.TrimLeft(linefields[0], "cpu")
+			cpu, _ := strconv.Atoi(cpustr)
+			running, _ := strconv.ParseInt(linefields[7], 10, 64)
+			waiting, _ := strconv.ParseInt(linefields[8], 10, 64)
+			m.cputags[linefields[0]] = map[string]string{"type": "hwthread", "type-id": fmt.Sprintf("%d", cpu)}
+			m.olddata[linefields[0]] = map[string]int64{"running": running, "waiting": waiting}
+			num_cpus++
+		}
+	}
+
+	// Save current timestamp
+	m.lastTimestamp = time.Now()
+
+	// Set this flag only if everything is initialized properly, all required files exist, ...
+	m.init = true
+	return err
+}
+
+func (m *SchedstatCollector) ParseProcLine(linefields []string, tags map[string]string, output chan lp.CCMetric, now time.Time, tsdelta time.Duration) {
+	running, _ := strconv.ParseInt(linefields[7], 10, 64)
+	waiting, _ := strconv.ParseInt(linefields[8], 10, 64)
+	diff_running := running - m.olddata[linefields[0]]["running"]
+	diff_waiting := waiting - m.olddata[linefields[0]]["waiting"]
+
+	var l_running float64 = float64(diff_running) / tsdelta.Seconds() / (math.Pow(1000, 3))
+	var l_waiting float64 = float64(diff_waiting) / tsdelta.Seconds() / (math.Pow(1000, 3))
+
+	m.olddata[linefields[0]]["running"] = running
+	m.olddata[linefields[0]]["waiting"] = waiting
+	value := l_running + l_waiting
+
+	y, err := lp.New("cpu_load_core", tags, m.meta, map[string]interface{}{"value": value}, now)
+	if err == nil {
+		// Send it to output channel
+		output <- y
+	}
+}
+
+// Read collects all metrics belonging to the sample collector
+// and sends them through the output channel to the collector manager
+func (m *SchedstatCollector) Read(interval time.Duration, output chan lp.CCMetric) {
+	if !m.init {
+		return
+	}
+
+	//timestamps
+	now := time.Now()
+	tsdelta := now.Sub(m.lastTimestamp)
+
+	file, err := os.Open(string(SCHEDSTATFILE))
+	if err != nil {
+		cclog.ComponentError(m.name, err.Error())
+	}
+	defer file.Close()
+
+	scanner := bufio.NewScanner(file)
+	for scanner.Scan() {
+		line := scanner.Text()
+		linefields := strings.Fields(line)
+		if strings.HasPrefix(linefields[0], "cpu") {
+			m.ParseProcLine(linefields, m.cputags[linefields[0]], output, now, tsdelta)
+		}
+	}
+
+	m.lastTimestamp = now
+
+}
+
+// Close metric collector: close network connection, close files, close libraries, ...
+// Called once by the collector manager
+func (m *SchedstatCollector) Close() {
+	// Unset flag
+	m.init = false
+}
--- a/collectors/schedstatMetric.md
+++ b/collectors/schedstatMetric.md
@@ -0,0 +1,11 @@
+
+## `schedstat` collector
+```json
+  "schedstat": {
+  }
+```
+
+The `schedstat` collector reads data from /proc/schedstat and calculates a load value, separated by hwthread. This might be useful to detect bad cpu pinning on shared nodes etc. 
+
+Metric:
+* `cpu_load_core`
--- a/collectors/selfMetric.go
+++ b/collectors/selfMetric.go
@@ -0,0 +1,144 @@
+package collectors
+
+import (
+	"encoding/json"
+	"runtime"
+	"syscall"
+	"time"
+
+	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
+)
+
+type SelfCollectorConfig struct {
+	MemStats   bool `json:"read_mem_stats"`
+	GoRoutines bool `json:"read_goroutines"`
+	CgoCalls   bool `json:"read_cgo_calls"`
+	Rusage     bool `json:"read_rusage"`
+}
+
+type SelfCollector struct {
+	metricCollector
+	config SelfCollectorConfig // the configuration structure
+	meta   map[string]string   // default meta information
+	tags   map[string]string   // default tags
+}
+
+func (m *SelfCollector) Init(config json.RawMessage) error {
+	var err error = nil
+	m.name = "SelfCollector"
+	m.setup()
+	m.parallel = true
+	m.meta = map[string]string{"source": m.name, "group": "Self"}
+	m.tags = map[string]string{"type": "node"}
+	if len(config) > 0 {
+		err = json.Unmarshal(config, &m.config)
+		if err != nil {
+			cclog.ComponentError(m.name, "Error reading config:", err.Error())
+			return err
+		}
+	}
+	m.init = true
+	return err
+}
+
+func (m *SelfCollector) Read(interval time.Duration, output chan lp.CCMetric) {
+	timestamp := time.Now()
+
+	if m.config.MemStats {
+		var memstats runtime.MemStats
+		runtime.ReadMemStats(&memstats)
+
+		y, err := lp.New("total_alloc", m.tags, m.meta, map[string]interface{}{"value": memstats.TotalAlloc}, timestamp)
+		if err == nil {
+			y.AddMeta("unit", "Bytes")
+			output <- y
+		}
+		y, err = lp.New("heap_alloc", m.tags, m.meta, map[string]interface{}{"value": memstats.HeapAlloc}, timestamp)
+		if err == nil {
+			y.AddMeta("unit", "Bytes")
+			output <- y
+		}
+		y, err = lp.New("heap_sys", m.tags, m.meta, map[string]interface{}{"value": memstats.HeapSys}, timestamp)
+		if err == nil {
+			y.AddMeta("unit", "Bytes")
+			output <- y
+		}
+		y, err = lp.New("heap_idle", m.tags, m.meta, map[string]interface{}{"value": memstats.HeapIdle}, timestamp)
+		if err == nil {
+			y.AddMeta("unit", "Bytes")
+			output <- y
+		}
+		y, err = lp.New("heap_inuse", m.tags, m.meta, map[string]interface{}{"value": memstats.HeapInuse}, timestamp)
+		if err == nil {
+			y.AddMeta("unit", "Bytes")
+			output <- y
+		}
+		y, err = lp.New("heap_released", m.tags, m.meta, map[string]interface{}{"value": memstats.HeapReleased}, timestamp)
+		if err == nil {
+			y.AddMeta("unit", "Bytes")
+			output <- y
+		}
+		y, err = lp.New("heap_objects", m.tags, m.meta, map[string]interface{}{"value": memstats.HeapObjects}, timestamp)
+		if err == nil {
+			output <- y
+		}
+	}
+	if m.config.GoRoutines {
+		y, err := lp.New("num_goroutines", m.tags, m.meta, map[string]interface{}{"value": runtime.NumGoroutine()}, timestamp)
+		if err == nil {
+			output <- y
+		}
+	}
+	if m.config.CgoCalls {
+		y, err := lp.New("num_cgo_calls", m.tags, m.meta, map[string]interface{}{"value": runtime.NumCgoCall()}, timestamp)
+		if err == nil {
+			output <- y
+		}
+	}
+	if m.config.Rusage {
+		var rusage syscall.Rusage
+		err := syscall.Getrusage(syscall.RUSAGE_SELF, &rusage)
+		if err == nil {
+			sec, nsec := rusage.Utime.Unix()
+			t := float64(sec) + (float64(nsec) * 1e-9)
+			y, err := lp.New("rusage_user_time", m.tags, m.meta, map[string]interface{}{"value": t}, timestamp)
+			if err == nil {
+				y.AddMeta("unit", "seconds")
+				output <- y
+			}
+			sec, nsec = rusage.Stime.Unix()
+			t = float64(sec) + (float64(nsec) * 1e-9)
+			y, err = lp.New("rusage_system_time", m.tags, m.meta, map[string]interface{}{"value": t}, timestamp)
+			if err == nil {
+				y.AddMeta("unit", "seconds")
+				output <- y
+			}
+			y, err = lp.New("rusage_vol_ctx_switch", m.tags, m.meta, map[string]interface{}{"value": rusage.Nvcsw}, timestamp)
+			if err == nil {
+				output <- y
+			}
+			y, err = lp.New("rusage_invol_ctx_switch", m.tags, m.meta, map[string]interface{}{"value": rusage.Nivcsw}, timestamp)
+			if err == nil {
+				output <- y
+			}
+			y, err = lp.New("rusage_signals", m.tags, m.meta, map[string]interface{}{"value": rusage.Nsignals}, timestamp)
+			if err == nil {
+				output <- y
+			}
+			y, err = lp.New("rusage_major_pgfaults", m.tags, m.meta, map[string]interface{}{"value": rusage.Majflt}, timestamp)
+			if err == nil {
+				output <- y
+			}
+			y, err = lp.New("rusage_minor_pgfaults", m.tags, m.meta, map[string]interface{}{"value": rusage.Minflt}, timestamp)
+			if err == nil {
+				output <- y
+			}
+		}
+
+	}
+}
+
+func (m *SelfCollector) Close() {
+	m.init = false
+}
--- a/collectors/selfMetric.md
+++ b/collectors/selfMetric.md
@@ -0,0 +1,34 @@
+## `self` collector
+
+```json
+  "self": {
+    "read_mem_stats" : true,
+    "read_goroutines" : true,
+    "read_cgo_calls" : true,
+    "read_rusage" : true
+  }
+```
+
+The `self` collector reads the data from the `runtime` and `syscall` packages, so monitors the execution of the cc-metric-collector itself.
+
+Metrics:
+* If `read_mem_stats == true`:
+  * `total_alloc`: The metric reports cumulative bytes allocated for heap objects.
+  * `heap_alloc`: The metric reports bytes of allocated heap objects.
+  * `heap_sys`: The metric reports bytes of heap memory obtained from the OS.
+  * `heap_idle`: The metric reports bytes in idle (unused) spans.
+  * `heap_inuse`: The metric reports bytes in in-use spans.
+  * `heap_released`: The metric reports bytes of physical memory returned to the OS.
+  * `heap_objects`: The metric reports the number of allocated heap objects.
+* If `read_goroutines == true`:
+  * `num_goroutines`: The metric reports the number of goroutines that currently exist.
+* If `read_cgo_calls == true`:
+  * `num_cgo_calls`: The metric reports the number of cgo calls made by the current process.
+* If `read_rusage == true`:
+  * `rusage_user_time`: The metric reports the amount of time that this process has been scheduled in user mode.
+  * `rusage_system_time`: The metric reports the amount of time that this process has been scheduled in kernel mode.
+  * `rusage_vol_ctx_switch`: The metric reports the amount of voluntary context switches.
+  * `rusage_invol_ctx_switch`: The metric reports the amount of involuntary context switches.
+  * `rusage_signals`: The metric reports the number of signals received.
+  * `rusage_major_pgfaults`: The metric reports the number of major faults the process has made which have required loading a memory page from disk.
+  * `rusage_minor_pgfaults`: The metric reports the number of minor faults the process has made which have not required loading a memory page from disk.
--- a/collectors/tempMetric.go
+++ b/collectors/tempMetric.go
@@ -3,111 +3,233 @@ package collectors
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
-	cclog "github.com/ClusterCockpit/cc-metric-collector/internal/ccLogger"
 	"os"
 	"path/filepath"
 	"strconv"
 	"strings"
 	"time"
-	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
+
+	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
 )

-const HWMON_PATH = `/sys/class/hwmon`
+// See: https://www.kernel.org/doc/html/latest/hwmon/sysfs-interface.html
+// /sys/class/hwmon/hwmon*/name -> coretemp
+// /sys/class/hwmon/hwmon*/temp*_label -> Core 0
+// /sys/class/hwmon/hwmon*/temp*_input -> 27800 = 27.8°C
+// /sys/class/hwmon/hwmon*/temp*_max -> 86000 = 86.0°C
+// /sys/class/hwmon/hwmon*/temp*_crit -> 100000 = 100.0°C

-type TempCollectorConfig struct {
-	ExcludeMetrics []string                     `json:"exclude_metrics"`
-	TagOverride    map[string]map[string]string `json:"tag_override"`
+type TempCollectorSensor struct {
+	name         string
+	label        string
+	metricName   string // Default: name_label
+	file         string
+	maxTempName  string
+	maxTemp      int64
+	critTempName string
+	critTemp     int64
+	tags         map[string]string
 }

 type TempCollector struct {
 	metricCollector
-	config TempCollectorConfig
+	config struct {
+		ExcludeMetrics     []string                     `json:"exclude_metrics"`
+		TagOverride        map[string]map[string]string `json:"tag_override"`
+		ReportMaxTemp      bool                         `json:"report_max_temperature"`
+		ReportCriticalTemp bool                         `json:"report_critical_temperature"`
+	}
+	sensors []*TempCollectorSensor
 }

 func (m *TempCollector) Init(config json.RawMessage) error {
+	// Check if already initialized
+	if m.init {
+		return nil
+	}
+
 	m.name = "TempCollector"
+	m.parallel = true
 	m.setup()
-	m.meta = map[string]string{"source": m.name, "group": "IPMI", "unit": "degC"}
 	if len(config) > 0 {
 		err := json.Unmarshal(config, &m.config)
 		if err != nil {
 			return err
 		}
 	}
+
+	m.meta = map[string]string{
+		"source": m.name,
+		"group":  "IPMI",
+		"unit":   "degC",
+	}
+
+	m.sensors = make([]*TempCollectorSensor, 0)
+
+	// Find all temperature sensor files
+	globPattern := filepath.Join("/sys/class/hwmon", "*", "temp*_input")
+	inputFiles, err := filepath.Glob(globPattern)
+	if err != nil {
+		return fmt.Errorf("unable to glob files with pattern '%s': %v", globPattern, err)
+	}
+	if inputFiles == nil {
+		return fmt.Errorf("unable to find any files with pattern '%s'", globPattern)
+	}
+
+	// Get sensor name for each temperature sensor file
+	for _, file := range inputFiles {
+		sensor := new(TempCollectorSensor)
+
+		// sensor name
+		nameFile := filepath.Join(filepath.Dir(file), "name")
+		name, err := os.ReadFile(nameFile)
+		if err == nil {
+			sensor.name = strings.TrimSpace(string(name))
+		}
+
+		// sensor label
+		labelFile := strings.TrimSuffix(file, "_input") + "_label"
+		label, err := os.ReadFile(labelFile)
+		if err == nil {
+			sensor.label = strings.TrimSpace(string(label))
+		}
+
+		// sensor metric name
+		switch {
+		case len(sensor.name) == 0 && len(sensor.label) == 0:
+			continue
+		case sensor.name == "coretemp" && strings.HasPrefix(sensor.label, "Core ") ||
+			sensor.name == "coretemp" && strings.HasPrefix(sensor.label, "Package id "):
+			sensor.metricName = "temp_" + sensor.label
+		case len(sensor.name) != 0 && len(sensor.label) != 0:
+			sensor.metricName = sensor.name + "_" + sensor.label
+		case len(sensor.name) != 0:
+			sensor.metricName = sensor.name
+		case len(sensor.label) != 0:
+			sensor.metricName = sensor.label
+		}
+		sensor.metricName = strings.ToLower(sensor.metricName)
+		sensor.metricName = strings.Replace(sensor.metricName, " ", "_", -1)
+		// Add temperature prefix, if required
+		if !strings.Contains(sensor.metricName, "temp") {
+			sensor.metricName = "temp_" + sensor.metricName
+		}
+
+		// Sensor file
+		_, err = os.ReadFile(file)
+		if err != nil {
+			continue
+		}
+		sensor.file = file
+
+		// Sensor tags
+		sensor.tags = map[string]string{
+			"type": "node",
+		}
+
+		// Apply tag override configuration
+		for key, newtags := range m.config.TagOverride {
+			if strings.Contains(sensor.file, key) {
+				sensor.tags = newtags
+				break
+			}
+		}
+
+		// max temperature
+		if m.config.ReportMaxTemp {
+			maxTempFile := strings.TrimSuffix(file, "_input") + "_max"
+			if buffer, err := os.ReadFile(maxTempFile); err == nil {
+				if x, err := strconv.ParseInt(strings.TrimSpace(string(buffer)), 10, 64); err == nil {
+					sensor.maxTempName = strings.Replace(sensor.metricName, "temp", "max_temp", 1)
+					sensor.maxTemp = x / 1000
+				}
+			}
+		}
+
+		// critical temperature
+		if m.config.ReportCriticalTemp {
+			criticalTempFile := strings.TrimSuffix(file, "_input") + "_crit"
+			if buffer, err := os.ReadFile(criticalTempFile); err == nil {
+				if x, err := strconv.ParseInt(strings.TrimSpace(string(buffer)), 10, 64); err == nil {
+					sensor.critTempName = strings.Replace(sensor.metricName, "temp", "crit_temp", 1)
+					sensor.critTemp = x / 1000
+				}
+			}
+		}
+
+		m.sensors = append(m.sensors, sensor)
+	}
+
+	// Empty sensors map
+	if len(m.sensors) == 0 {
+		return fmt.Errorf("no temperature sensors found")
+	}
+
+	// Finished initialization
 	m.init = true
 	return nil
 }

-func get_hwmon_sensors() (map[string]map[string]string, error) {
-	var folders []string
-	var sensors map[string]map[string]string
-	sensors = make(map[string]map[string]string)
-	err := filepath.Walk(HWMON_PATH, func(p string, info os.FileInfo, err error) error {
-		if info.IsDir() {
-			return nil
-		}
-		folders = append(folders, p)
-		return nil
-	})
-	if err != nil {
-		return sensors, err
-	}
-
-	for _, f := range folders {
-		sensors[f] = make(map[string]string)
-		myp := fmt.Sprintf("%s/", f)
-		err := filepath.Walk(myp, func(path string, info os.FileInfo, err error) error {
-			dir, fname := filepath.Split(path)
-			if strings.Contains(fname, "temp") && strings.Contains(fname, "_input") {
-				namefile := fmt.Sprintf("%s/%s", dir, strings.Replace(fname, "_input", "_label", -1))
-				name, ierr := ioutil.ReadFile(namefile)
-				if ierr == nil {
-					sensors[f][strings.Replace(string(name), "\n", "", -1)] = path
-				}
-			}
-			return nil
-		})
-		if err != nil {
-			continue
-		}
-	}
-	return sensors, nil
-}
-
 func (m *TempCollector) Read(interval time.Duration, output chan lp.CCMetric) {

-	sensors, err := get_hwmon_sensors()
-	if err != nil {
-		return
-	}
-	for _, files := range sensors {
-		for name, file := range files {
-			tags := map[string]string{"type": "node"}
-			for key, newtags := range m.config.TagOverride {
-				if strings.Contains(file, key) {
-					tags = newtags
-					break
-				}
-			}
-			mname := strings.Replace(name, " ", "_", -1)
-			if !strings.Contains(mname, "temp") {
-				mname = fmt.Sprintf("temp_%s", mname)
-			}
-			buffer, err := ioutil.ReadFile(string(file))
-			if err != nil {
-				continue
-			}
-			x, err := strconv.ParseInt(strings.Replace(string(buffer), "\n", "", -1), 0, 64)
+	for _, sensor := range m.sensors {
+		// Read sensor file
+		buffer, err := os.ReadFile(sensor.file)
+		if err != nil {
+			cclog.ComponentError(
+				m.name,
+				fmt.Sprintf("Read(): Failed to read file '%s': %v", sensor.file, err))
+			continue
+		}
+		x, err := strconv.ParseInt(strings.TrimSpace(string(buffer)), 10, 64)
+		if err != nil {
+			cclog.ComponentError(
+				m.name,
+				fmt.Sprintf("Read(): Failed to convert temperature '%s' to int64: %v", buffer, err))
+			continue
+		}
+		x /= 1000
+		y, err := lp.New(
+			sensor.metricName,
+			sensor.tags,
+			m.meta,
+			map[string]interface{}{"value": x},
+			time.Now(),
+		)
+		if err == nil {
+			output <- y
+		}
+
+		// max temperature
+		if m.config.ReportMaxTemp && sensor.maxTemp != 0 {
+			y, err := lp.New(
+				sensor.maxTempName,
+				sensor.tags,
+				m.meta,
+				map[string]interface{}{"value": sensor.maxTemp},
+				time.Now(),
+			)
 			if err == nil {
-				y, err := lp.New(strings.ToLower(mname), tags, m.meta, map[string]interface{}{"value": int(float64(x) / 1000)}, time.Now())
-				if err == nil {
-					cclog.ComponentDebug(m.name, y)
-					output <- y
-				}
+				output <- y
+			}
+		}
+
+		// critical temperature
+		if m.config.ReportCriticalTemp && sensor.critTemp != 0 {
+			y, err := lp.New(
+				sensor.critTempName,
+				sensor.tags,
+				m.meta,
+				map[string]interface{}{"value": sensor.critTemp},
+				time.Now(),
+			)
+			if err == nil {
+				output <- y
 			}
 		}
 	}
+
 }

 func (m *TempCollector) Close() {
--- a/collectors/topprocsMetric.go
+++ b/collectors/topprocsMetric.go
@@ -8,7 +8,8 @@ import (
 	"os/exec"
 	"strings"
 	"time"
-	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
+
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
 )

 const MAX_NUM_PROCS = 10
@@ -27,6 +28,7 @@ type TopProcsCollector struct {
 func (m *TopProcsCollector) Init(config json.RawMessage) error {
 	var err error
 	m.name = "TopProcsCollector"
+	m.parallel = true
 	m.tags = map[string]string{"type": "node"}
 	m.meta = map[string]string{"source": m.name, "group": "TopProcs"}
 	if len(config) > 0 {
@@ -38,14 +40,14 @@ func (m *TopProcsCollector) Init(config json.RawMessage) error {
 		m.config.Num_procs = int(DEFAULT_NUM_PROCS)
 	}
 	if m.config.Num_procs <= 0 || m.config.Num_procs > MAX_NUM_PROCS {
-		return errors.New(fmt.Sprintf("num_procs option must be set in 'topprocs' config (range: 1-%d)", MAX_NUM_PROCS))
+		return fmt.Errorf("num_procs option must be set in 'topprocs' config (range: 1-%d)", MAX_NUM_PROCS)
 	}
 	m.setup()
 	command := exec.Command("ps", "-Ao", "comm", "--sort=-pcpu")
 	command.Wait()
 	_, err = command.Output()
 	if err != nil {
-		return errors.New("Failed to execute command")
+		return errors.New("failed to execute command")
 	}
 	m.init = true
 	return nil
--- a/config.json
+++ b/config.json
@@ -1,8 +1,8 @@
 {
-  "sinks": "sinks.json",
-  "collectors" : "collectors.json",
-  "receivers" : "receivers.json",
-  "router" : "router.json",
-  "interval": 10,
-  "duration": 1
+  "sinks": "./sinks.json",
+  "collectors" : "./collectors.json",
+  "receivers" : "./receivers.json",
+  "router" : "./router.json",
+  "interval": "10s",
+  "duration": "1s"
 }
--- a/docs/building.md
+++ b/docs/building.md
@@ -0,0 +1,74 @@
+# Building the cc-metric-collector
+
+In most cases, a simple `make` in the main folder is enough to get a `cc-metric-collector` binary. It is basically a `go build` but some collectors require additional tasks. There is currently no Golang interface to LIKWID, so it uses `cgo` to create bindings but `cgo` requires the LIKWID header files. Therefore, it checks whether LIKWID is installed and if not it downloads LIKWID and copies the headers.
+
+## System integration
+
+The main configuration settings for system integration are pre-defined in `scripts/cc-metric-collector.config`. The file contains the UNIX user and group used for execution, the PID file location and other settings. Adjust it accordingly and copy it to `/etc/default/cc-metric-collector`
+
+```bash
+$ install --mode 644 \
+          --owner $CC_USER \
+          --group $CC_GROUP \
+          scripts/cc-metric-collector.config /etc/default/cc-metric-collector
+$ edit /etc/default/cc-metric-collector
+```
+
+### SysVinit and similar
+
+If you are using a init system based in `/etc/init.d` daemons, you can use the sample `scripts/cc-metric-collector.init`. It reads the basic configuration from `/etc/default/cc-metric-collector`
+
+```bash
+$ install --mode 755 \
+          --owner $CC_USER \
+          --group $CC_GROUP \
+          scripts/cc-metric-collector.init /etc/init.d/cc-metric-collector
+```
+
+### Systemd
+
+If you are using `systemd` as init system, you can use the sample systemd service file `scripts/cc-metric-collector.service`, the configuration file `scripts/cc-metric-collector.config`.
+
+```bash
+$ install --mode 644  \
+          --owner $CC_USER \
+          --group $CC_GROUP \
+           scripts/cc-metric-collector.service /etc/systemd/system/cc-metric-collector.service
+$ systemctl enable cc-metric-collector
+```
+
+## Packaging
+
+### RPM
+
+In order to get a RPM packages for cc-metric-collector, just use:
+
+```bash
+$ make RPM
+```
+
+It uses the RPM SPEC file `scripts/cc-metric-collector.spec` and requires the RPM tools (`rpm` and `rpmspec`) and `git`.
+
+### DEB
+
+In order to get very simple Debian packages for cc-metric-collector, just use:
+
+```bash
+$ make DEB
+```
+
+It uses the DEB control file `scripts/cc-metric-collector.control` and requires `dpkg-deb`, `awk`, `sed` and `git`. It creates only a binary deb package.
+
+_This option is not well tested and therefore experimental_
+
+### Customizing RPMs or DEB packages
+
+If you want to customize the RPMs or DEB packages for your local system, use the following workflow.
+
+- (if there is already a fork in the private account, delete it and wait until Github realizes the deletion)
+- Fork the cc-metric-collector repository (if Github hasn't realized it, it creates a fork named cc-metric-collector2)
+- Go to private cc-metric-collector repository and enable Github Actions
+- Do changes to the scripts, code, ... Commit and push your changes.
+- Tag the new commit with `v0.x.y-<myversion>` (`git tag v0.x.y-<myversion>`)
+- Push tags to repository (`git push --tags`)
+- Wait until the Release action finishes. It creates fresh RPMs and DEBs in your private repository on the Releases page.
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -0,0 +1,189 @@
+# Configuring the CC metric collector
+
+The configuration of the CC metric collector consists of five configuration files: one global file and four component related files.
+
+## Global configuration
+
+The global file contains the paths to the other four files and some global options. 
+
+```json
+{
+  "sinks": "sinks.json",
+  "collectors" : "collectors.json",
+  "receivers" : "receivers.json",
+  "router" : "router.json",
+  "interval": 10,
+  "duration": 1
+}
+```
+
+Be aware that the paths are relative to the execution folder of the cc-metric-collector binary, so it is recommended to use absolute paths.
+
+## Component configuration
+
+The others are mainly list of of subcomponents: the collectors, the receivers, the router and the sinks. Their role is best shown in a picture:
+
+```mermaid
+flowchart LR
+
+  subgraph col ["Collectors"]
+  direction TB
+  cpustat["cpustat"]
+  memstat["memstat"]
+  tempstat["tempstat"]
+  misc["..."]
+  end
+  
+  subgraph Receivers ["Receivers"]
+  direction TB
+  nats["NATS"]
+  httprecv["HTTP"]
+  miscrecv[...]
+  end
+
+  subgraph calc["Aggregator"]
+  direction LR
+  cache["Cache"]
+  agg["Calculator"]
+  end
+
+  subgraph sinks ["Sinks"]
+  direction RL
+  influx["InfluxDB"]
+  ganglia["Ganglia"]
+  logger["Logfile"]
+  miscsink["..."]
+  end
+
+  cpustat --> CollectorManager["CollectorManager"]
+  memstat --> CollectorManager
+  tempstat --> CollectorManager
+  misc --> CollectorManager
+
+  nats  --> ReceiverManager["ReceiverManager"]
+  httprecv --> ReceiverManager
+  miscrecv --> ReceiverManager
+
+  CollectorManager --> newrouter["Router"]
+  ReceiverManager -.-> newrouter
+  calc -.-> newrouter
+  newrouter --> SinkManager["SinkManager"]
+  newrouter -.-> calc
+
+  SinkManager --> influx
+  SinkManager --> ganglia
+  SinkManager --> logger
+  SinkManager --> miscsink
+
+
+```
+
+There are four parts:
+- The collectors read data from files, execute commands and call dynamically loaded library function and send it to the router
+- The router can process metrics by cacheing and evaluating functions and conditions on them
+- The sinks send the metrics to storage backends
+- The receivers can be used to receive metrics from other collectors and forward them to the router. They can be used to create a tree-like structure of collectors.
+
+(A maybe better differentiation between collectors and receivers is that the collectors are called periodically while the receivers have their own logic and submit metrics at any time)
+
+
+### Collectors configuration file
+
+The collectors configuration file tells which metrics should be queried from the system. The metric gathering is logically grouped in so called 'Collectors'. So there are Collectors to read CPU, memory or filesystem statistics. The collectors configuration file is a list of these collectors with collector-specific configurations:
+
+```json
+{
+  "cpustat" : {},
+  "diskstat": {
+    "exclude_metrics": [
+      "disk_total"
+    ]
+  }
+}
+```
+
+The first one is the CPU statistics collector without any collector-specific setting. The second one enables disk mount statistics but excludes the metric `disk_total`.
+
+All names and possible collector-specific configuration options can be found [here](../collectors/README.md).
+
+Some collectors might dynamically load shared libraries. In order to enable these collectors, make sure that the shared library path is part of the `LD_LIBRARY_PATH` environment variable.
+
+### Sinks configuration file
+
+The sinks define the output/sending of metrics. The metrics can be forwarded to multiple sinks, even to sinks of the same type. The sinks configuration file is a list of these sinks, each with an individual name.
+
+```json
+{
+  "myinflux" : {
+    "type" : "influxasync",
+    "host": "localhost",
+    "port": "8086",
+    "organization" : "testorga",
+    "database" : "testbucket",
+    "password" : "<my secret JWT>"
+  },
+  "companyinflux" : {
+    "type" : "influxasync",
+    "host": "companyhost",
+    "port": "8086",
+    "organization" : "company",
+    "database" : "main",
+    "password" : "<company's secret JWT>"
+  }
+}
+```
+
+The above example configuration file defines two sink, both ot type `influxasync`. They are differentiated internally by the names: `myinflux` and `companyinflux`.
+
+All types and possible sink-specific configuration options can be found [here](../sinks/README.md).
+
+Some sinks might dynamically load shared libraries. In order to enable these sinks, make sure that the shared library path is part of the `LD_LIBRARY_PATH` environment variable.
+
+### Router configuration file
+
+The collectors and the sinks are connected through the router. The router forwards the metrics to the sinks but enables some data processing. A common example is to tag all passing metrics like adding `cluster=mycluster`. But also aggregations like "take the average of all 'ipc' metrics" (ipc -> Instructions Per Cycle). Since the configurations of these aggregations can be quite complicated, we refer to the router's [README](../internal/metricRouter/README.md).
+
+A simple router configuration file to start with looks like this:
+
+```json
+{
+    "add_tags" : [
+        {
+            "key" : "cluster",
+            "value" : "mycluster",
+            "if" : "*"
+        }
+    ],
+    "interval_timestamp" : false,
+    "num_cache_intervals" : 0
+}
+```
+
+With the `add_tags` section, we tell to attach the `cluster=mycluster` tag to each (`*` metric). The `interval_timestamp` tell the router to not touch the timestamp of metrics. It is possible to send all metrics within an interval with a common time stamp to avoid later alignment issues. The `num_cache_intervals` diables the cache completely. The cache is only required if you want to do complex metric aggregations.
+
+All configuration options can be found [here](../internal/metricRouter/README.md).
+
+### Receivers configuration file
+
+The receivers are a special feature of the CC Metric Collector to enable simpler integration into exising setups. While collectors query data from the local system, the receivers commonly get data from other systems through some network technology like HTTP or NATS. The idea is keep the current setup but send it to a CC Metric Collector which forwards it to the the destination system (if a sink exists for it). For most setups, the receivers are not required and an the receiver config file should contain only an empty JSON map (`{}`). 
+
+```json
+{
+  "nats_rack0": {
+    "type": "nats",
+    "address" : "nats-server.example.org",
+    "port" : "4222",
+    "subject" : "rack0",
+  },
+  "nats_rack1": {
+    "type": "nats",
+    "address" : "nats-server.example.org",
+    "port" : "4222",
+    "subject" : "rack1",
+  }
+}
+```
+
+This example configuration creates two receivers with the names `nats_rack0` and `nats_rack1`. While one subscribes to metrics published with the `rack0` subject, the other one subscribes to the `rack0` subject. The NATS server is the same as it manages all subjects in a subnet. (As example, the router could add tags `rack=0` and `rack=1` respectively to the received metrics.)
+
+All types and possible receiver-specific configuration options can be found [here](../receivers/README.md).
--- a/docs/introduction.md
+++ b/docs/introduction.md
@@ -0,0 +1,23 @@
+# The ClusterCockpit Project
+
+The ClusterCockpit project is a joined project of computing centers in Europe to set up a cluster monitoring stack for small to mid-sized computing centers under the lead of NHR@FAU.
+
+# The ClusterCockpit Stack
+
+In cluster environment, there are commonly a lot of systems dedicated for computation, backend servers for file systems and frontend servers for the user interaction and cluster control. The ClusterCockpit Stack is mainly used for monitoring the compute systems with some interaction to the frontend servers. It consists of multiple components:
+
+- cc-metric-collector: Monitor resource usage on the compute systems
+- cc-metric-store: In-memory database
+- cc-backend & cc-frontend: The web-based visualizer
+
+# CC Metric Collector
+
+The CC Metric Collector project was started to provide a useful set of metrics for HPC and data science related compute systems. It runs as a system daemon and gathers system data periodically to forward the metrics to one or more databases. One of the provided backends can be used for the cc-metric-store but many others exist like InfluxDB time-series databases, the Ganglia Monitoring System or the Prometheus Monitoring System.
+
+The data is gathered by so-called "Collectors", forwarded to an internal router for on-the-fly manipulation (tagging, aggregation, ...) which pushes the metrics to the different metric writers called "Sinks". There is a forth component, the "Receivers", which receive data through some networking system like a HTTP server at any time.
+
+# CC Metric Store
+The CC Metric Store is a data management system with short-term in-memory and long-term file-base metric storage.
+
+# CC Backend and CC Frontend
+The CC Backend and Frontend form together the web interface for ClusterCockpit.
--- a/go.mod
+++ b/go.mod
@@ -1,20 +1,106 @@
 module github.com/ClusterCockpit/cc-metric-collector

-go 1.16
+go 1.20

 require (
-	github.com/NVIDIA/go-nvml v0.11.1-0
-	github.com/influxdata/influxdb-client-go/v2 v2.7.0
+	github.com/ClusterCockpit/cc-units v0.4.0
+	github.com/ClusterCockpit/go-rocm-smi v0.3.0
+	github.com/NVIDIA/go-nvml v0.12.0-1
+	github.com/PaesslerAG/gval v1.2.2
+	github.com/fsnotify/fsnotify v1.6.0
+	github.com/gorilla/mux v1.8.0
+	github.com/gosnmp/gosnmp v1.37.0
+	github.com/influxdata/influxdb-client-go/v2 v2.12.3
 	github.com/influxdata/line-protocol v0.0.0-20210922203350-b1ad95c89adf
-	github.com/nats-io/nats.go v1.13.1-0.20211122170419-d7c1d78a50fc
-	golang.org/x/sys v0.0.0-20220114195835-da31bd327af9
-	gopkg.in/Knetic/govaluate.v2 v2.3.0
+	github.com/influxdata/line-protocol/v2 v2.2.1
+	github.com/nats-io/nats.go v1.30.2
+	github.com/prometheus/client_golang v1.17.0
+	github.com/stmcginnis/gofish v0.14.0
+	github.com/tklauser/go-sysconf v0.3.12
+	golang.design/x/thread v0.0.0-20210122121316-335e9adffdf1
+	golang.org/x/exp v0.0.0-20231006140011-7918f672742d
+	golang.org/x/sys v0.13.0
 )

 require (
-	github.com/PaesslerAG/gval v1.1.2
-	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/mattn/go-sqlite3 v1.14.11
-	github.com/nats-io/nats-server/v2 v2.7.0 // indirect
-	google.golang.org/protobuf v1.27.1 // indirect
+	github.com/BurntSushi/toml v1.3.2 // indirect
+	github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53 // indirect
+	github.com/CloudyKit/jet/v6 v6.2.0 // indirect
+	github.com/Joker/jade v1.1.3 // indirect
+	github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect
+	github.com/andybalholm/brotli v1.0.5 // indirect
+	github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
+	github.com/aymerick/douceur v0.2.0 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/bytedance/sonic v1.10.2 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
+	github.com/chenzhuoyu/iasm v0.9.0 // indirect
+	github.com/deepmap/oapi-codegen v1.15.0 // indirect
+	github.com/fatih/structs v1.1.0 // indirect
+	github.com/flosch/pongo2/v4 v4.0.2 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
+	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/gin-gonic/gin v1.9.1 // indirect
+	github.com/go-playground/locales v0.14.1 // indirect
+	github.com/go-playground/universal-translator v0.18.1 // indirect
+	github.com/go-playground/validator/v10 v10.15.5 // indirect
+	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/gomarkdown/markdown v0.0.0-20230922112808-5421fefb8386 // indirect
+	github.com/google/uuid v1.3.1 // indirect
+	github.com/gorilla/css v1.0.0 // indirect
+	github.com/iris-contrib/schema v0.0.6 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/kataras/blocks v0.0.8 // indirect
+	github.com/kataras/golog v0.1.9 // indirect
+	github.com/kataras/iris/v12 v12.2.7 // indirect
+	github.com/kataras/pio v0.0.12 // indirect
+	github.com/kataras/sitemap v0.0.6 // indirect
+	github.com/kataras/tunnel v0.0.4 // indirect
+	github.com/klauspost/compress v1.17.0 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
+	github.com/labstack/echo/v4 v4.11.1 // indirect
+	github.com/labstack/gommon v0.4.0 // indirect
+	github.com/leodido/go-urn v1.2.4 // indirect
+	github.com/mailgun/raymond/v2 v2.0.48 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/microcosm-cc/bluemonday v1.0.25 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/nats-io/nats-server/v2 v2.8.4 // indirect
+	github.com/nats-io/nkeys v0.4.5 // indirect
+	github.com/nats-io/nuid v1.0.1 // indirect
+	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/prometheus/client_model v0.5.0 // indirect
+	github.com/prometheus/common v0.44.0 // indirect
+	github.com/prometheus/procfs v0.12.0 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/schollz/closestmatch v2.1.0+incompatible // indirect
+	github.com/shopspring/decimal v1.3.1 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
+	github.com/tdewolff/minify/v2 v2.12.9 // indirect
+	github.com/tdewolff/parse/v2 v2.6.8 // indirect
+	github.com/tklauser/numcpus v0.6.1 // indirect
+	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
+	github.com/ugorji/go/codec v1.2.11 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
+	github.com/valyala/fasttemplate v1.2.2 // indirect
+	github.com/vmihailenco/msgpack/v5 v5.4.0 // indirect
+	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
+	github.com/yosssi/ace v0.0.5 // indirect
+	golang.org/x/arch v0.5.0 // indirect
+	golang.org/x/crypto v0.14.0 // indirect
+	golang.org/x/net v0.16.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
+	golang.org/x/time v0.3.0 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -1,147 +1,331 @@
-github.com/NVIDIA/go-nvml v0.11.1-0 h1:XHSz3zZKC4NCP2ja1rI7++DXFhA+uDhdYa3MykCTGHY=
-github.com/NVIDIA/go-nvml v0.11.1-0/go.mod h1:hy7HYeQy335x6nEss0Ne3PYqleRa6Ct+VKD9RQ4nyFs=
-github.com/PaesslerAG/gval v1.1.2 h1:EROKxV4/fAKWb0Qoj7NOxmHZA7gcpjOV9XgiRZMRCUU=
-github.com/PaesslerAG/gval v1.1.2/go.mod h1:Fa8gfkCmUsELXgayr8sfL/sw+VzCVoa03dcOcR/if2w=
+github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
+github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
+github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53 h1:sR+/8Yb4slttB4vD+b9btVEnWgL3Q00OBTzVT8B9C0c=
+github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno=
+github.com/CloudyKit/jet/v6 v6.2.0 h1:EpcZ6SR9n28BUGtNJSvlBqf90IpjeFr36Tizxhn/oME=
+github.com/CloudyKit/jet/v6 v6.2.0/go.mod h1:d3ypHeIRNo2+XyqnGA8s+aphtcVpjP5hPwP/Lzo7Ro4=
+github.com/ClusterCockpit/cc-units v0.4.0 h1:zP5DOu99GmErW0tCDf0gcLrlWt42RQ9dpoONEOh4cI0=
+github.com/ClusterCockpit/cc-units v0.4.0/go.mod h1:3S3PAhAayS3pbgcT4q9Vn9VJw22Op51X0YimtG77zBw=
+github.com/ClusterCockpit/go-rocm-smi v0.3.0 h1:1qZnSpG7/NyLtc7AjqnUL9Jb8xtqG1nMVgp69rJfaR8=
+github.com/ClusterCockpit/go-rocm-smi v0.3.0/go.mod h1:+I3UMeX3OlizXDf1WpGD43W4KGZZGVSGmny6rTeOnWA=
+github.com/Joker/hpp v1.0.0 h1:65+iuJYdRXv/XyN62C1uEmmOx3432rNG/rKlX6V7Kkc=
+github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY=
+github.com/Joker/jade v1.1.3 h1:Qbeh12Vq6BxURXT1qZBRHsDxeURB8ztcL6f3EXSGeHk=
+github.com/Joker/jade v1.1.3/go.mod h1:T+2WLyt7VH6Lp0TRxQrUYEs64nRc83wkMQrfeIQKduM=
+github.com/NVIDIA/go-nvml v0.11.6-0/go.mod h1:hy7HYeQy335x6nEss0Ne3PYqleRa6Ct+VKD9RQ4nyFs=
+github.com/NVIDIA/go-nvml v0.12.0-1 h1:6mdjtlFo+17dWL7VFPfuRMtf0061TF4DKls9pkSw6uM=
+github.com/NVIDIA/go-nvml v0.12.0-1/go.mod h1:hy7HYeQy335x6nEss0Ne3PYqleRa6Ct+VKD9RQ4nyFs=
+github.com/PaesslerAG/gval v1.2.2 h1:Y7iBzhgE09IGTt5QgGQ2IdaYYYOU134YGHBThD+wm9E=
+github.com/PaesslerAG/gval v1.2.2/go.mod h1:XRFLwvmkTEdYziLdaCeCa5ImcGVrfQbeNUbVR+C6xac=
+github.com/PaesslerAG/jsonpath v0.1.0 h1:gADYeifvlqK3R3i2cR5B4DGgxLXIPb3TRTH1mGi0jPI=
 github.com/PaesslerAG/jsonpath v0.1.0/go.mod h1:4BzmtoM/PI8fPO4aQGIusjGxGir2BzcV0grWtFzq1Y8=
-github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
+github.com/RaveNoX/go-jsoncommentstrip v1.0.0/go.mod h1:78ihd09MekBnJnxpICcwzCMzGrKSKYe4AqU6PDYYpjk=
+github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 h1:KkH3I3sJuOLP3TjA/dfr4NAY8bghDwnXiU7cTKxQqo0=
+github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06/go.mod h1:7erjKLwalezA0k99cWs5L11HWOAPNjdUZ6RxH1BXbbM=
+github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU=
+github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs=
+github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
+github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ=
+github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk=
+github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
+github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
+github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w=
+github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
+github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM=
+github.com/bytedance/sonic v1.10.2 h1:GQebETVBxYB7JGWJtLBi07OVzWwt+8dWA00gEVW2ZFE=
+github.com/bytedance/sonic v1.10.2/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4=
+github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
+github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
+github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
+github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d h1:77cEq6EriyTZ0g/qfRdp61a3Uu/AWrgIq2s0ClJV1g0=
+github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpVsBuRksnlj1mLy4AWzRNQYxauNi62uWcE3to6eA=
+github.com/chenzhuoyu/iasm v0.9.0 h1:9fhXjVzq5hUy2gkhhgHl95zG2cEAhw9OSGs8toWWAwo=
+github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/deepmap/oapi-codegen v1.8.2 h1:SegyeYGcdi0jLLrpbCMoJxnUUn8GBXHsvr4rbzjuhfU=
-github.com/deepmap/oapi-codegen v1.8.2/go.mod h1:YLgSKSDv/bZQB7N4ws6luhozi3cEdRktEqrX88CvjIw=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4=
-github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs=
-github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/deepmap/oapi-codegen v1.15.0 h1:SQqViaeb4k2vMul8gx12oDOIadEtoRqTdLkxjzqtQ90=
+github.com/deepmap/oapi-codegen v1.15.0/go.mod h1:a6KoHV7lMRwsPoEg2C6NDHiXYV3EQfiFocOlJ8dgJQE=
+github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
+github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
+github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
+github.com/flosch/pongo2/v4 v4.0.2 h1:gv+5Pe3vaSVmiJvh/BZa82b7/00YUGm0PIyVVLop0Hw=
+github.com/flosch/pongo2/v4 v4.0.2/go.mod h1:B5ObFANs/36VwxxlgKpdchIJHMvHB562PW+BWPhwZD8=
+github.com/frankban/quicktest v1.11.0/go.mod h1:K+q6oSqb0W0Ininfk863uOk1lMy69l/P6txr3mVT54s=
+github.com/frankban/quicktest v1.11.2/go.mod h1:K+q6oSqb0W0Ininfk863uOk1lMy69l/P6txr3mVT54s=
+github.com/frankban/quicktest v1.13.0 h1:yNZif1OkDfNoDfb9zZa9aXIpejNR4F23Wely0c+Qdqk=
+github.com/frankban/quicktest v1.13.0/go.mod h1:qLE0fzW0VuyUAJgPU19zByoIr0HtCHN/r/VLSOOIySU=
+github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
+github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
+github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
+github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
+github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
+github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
+github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
+github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
+github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
+github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
+github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
+github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
+github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
+github.com/go-playground/validator/v10 v10.15.5 h1:LEBecTWb/1j5TNY1YYG2RcOUN3R7NLylN+x8TTueE24=
+github.com/go-playground/validator/v10 v10.15.5/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
+github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
+github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
+github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219/go.mod h1:/X8TswGSh1pIozq4ZwCfxS0WA5JGXguxk94ar/4c87Y=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
+github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/gomarkdown/markdown v0.0.0-20230922112808-5421fefb8386 h1:EcQR3gusLHN46TAD+G+EbaaqJArt5vHhNpXAa12PQf4=
+github.com/gomarkdown/markdown v0.0.0-20230922112808-5421fefb8386/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA=
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
+github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
+github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
+github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
-github.com/influxdata/influxdb-client-go/v2 v2.7.0 h1:QgP5mlBE9sGnzplpnf96pr+p7uqlIlL4W2GAP3n+XZg=
-github.com/influxdata/influxdb-client-go/v2 v2.7.0/go.mod h1:Y/0W1+TZir7ypoQZYd2IrnVOKB3Tq6oegAQeSVN/+EU=
-github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo=
+github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
+github.com/gosnmp/gosnmp v1.37.0 h1:/Tf8D3b9wrnNuf/SfbvO+44mPrjVphBhRtcGg22V07Y=
+github.com/gosnmp/gosnmp v1.37.0/go.mod h1:GDH9vNqpsD7f2HvZhKs5dlqSEcAS6s6Qp099oZRCR+M=
+github.com/imkira/go-interpol v1.1.0 h1:KIiKr0VSG2CUW1hl1jpiyuzuJeKUUpC8iM1AIE7N1Vk=
+github.com/influxdata/influxdb-client-go/v2 v2.12.3 h1:28nRlNMRIV4QbtIUvxhWqaxn0IpXeMSkY/uJa/O/vC4=
+github.com/influxdata/influxdb-client-go/v2 v2.12.3/go.mod h1:IrrLUbCjjfkmRuaCiGQg4m2GbkaeJDcuWoxiWdQEbA0=
 github.com/influxdata/line-protocol v0.0.0-20210922203350-b1ad95c89adf h1:7JTmneyiNEwVBOHSjoMxiWAqB992atOeepeFYegn5RU=
 github.com/influxdata/line-protocol v0.0.0-20210922203350-b1ad95c89adf/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo=
-github.com/klauspost/compress v1.13.4 h1:0zhec2I8zGnjWcKyLl6i3gPqKANCCn5e9xmviEEeX6s=
-github.com/klauspost/compress v1.13.4/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
-github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/influxdata/line-protocol-corpus v0.0.0-20210519164801-ca6fa5da0184/go.mod h1:03nmhxzZ7Xk2pdG+lmMd7mHDfeVOYFyhOgwO61qWU98=
+github.com/influxdata/line-protocol-corpus v0.0.0-20210922080147-aa28ccfb8937 h1:MHJNQ+p99hFATQm6ORoLmpUCF7ovjwEFshs/NHzAbig=
+github.com/influxdata/line-protocol-corpus v0.0.0-20210922080147-aa28ccfb8937/go.mod h1:BKR9c0uHSmRgM/se9JhFHtTT7JTO67X23MtKMHtZcpo=
+github.com/influxdata/line-protocol/v2 v2.0.0-20210312151457-c52fdecb625a/go.mod h1:6+9Xt5Sq1rWx+glMgxhcg2c0DUaehK+5TDcPZ76GypY=
+github.com/influxdata/line-protocol/v2 v2.1.0/go.mod h1:QKw43hdUBg3GTk2iC3iyCxksNj7PX9aUSeYOYE/ceHY=
+github.com/influxdata/line-protocol/v2 v2.2.1 h1:EAPkqJ9Km4uAxtMRgUubJyqAr6zgWM0dznKMLRauQRE=
+github.com/influxdata/line-protocol/v2 v2.2.1/go.mod h1:DmB3Cnh+3oxmG6LOBIxce4oaL4CPj3OmMPgvauXh+tM=
+github.com/iris-contrib/httpexpect/v2 v2.15.2 h1:T9THsdP1woyAqKHwjkEsbCnMefsAFvk8iJJKokcJ3Go=
+github.com/iris-contrib/schema v0.0.6 h1:CPSBLyx2e91H2yJzPuhGuifVRnZBBJ3pCOMbOvPZaTw=
+github.com/iris-contrib/schema v0.0.6/go.mod h1:iYszG0IOsuIsfzjymw1kMzTL8YQcCWlm65f3wX8J5iA=
+github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
+github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
+github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
+github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d/go.mod h1:2PavIy+JPciBPrBUjwbNvtwB6RQlve+hkpll6QSNmOE=
+github.com/kataras/blocks v0.0.8 h1:MrpVhoFTCR2v1iOOfGng5VJSILKeZZI+7NGfxEh3SUM=
+github.com/kataras/blocks v0.0.8/go.mod h1:9Jm5zx6BB+06NwA+OhTbHW1xkMOYxahnqTN5DveZ2Yg=
+github.com/kataras/golog v0.1.9 h1:vLvSDpP7kihFGKFAvBSofYo7qZNULYSHOH2D7rPTKJk=
+github.com/kataras/golog v0.1.9/go.mod h1:jlpk/bOaYCyqDqH18pgDHdaJab72yBE6i0O3s30hpWY=
+github.com/kataras/iris/v12 v12.2.7 h1:C9KWZmZT5pB5f2ot1XYWDBdi5XeTz0CGweHRXCDARZg=
+github.com/kataras/iris/v12 v12.2.7/go.mod h1:mD76k/tIBFy8pHTFIgUPrVrkI4lTKvFbIcfbStJSBnA=
+github.com/kataras/pio v0.0.12 h1:o52SfVYauS3J5X08fNjlGS5arXHjW/ItLkyLcKjoH6w=
+github.com/kataras/pio v0.0.12/go.mod h1:ODK/8XBhhQ5WqrAhKy+9lTPS7sBf6O3KcLhc9klfRcY=
+github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY=
+github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4=
+github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA=
+github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw=
+github.com/klauspost/compress v1.17.0 h1:Rnbp4K9EjcDuVuHtd0dgA4qNuv9yKDYKK1ulpJwgrqM=
+github.com/klauspost/compress v1.17.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
+github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
+github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
+github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/labstack/echo/v4 v4.2.1/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg=
-github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
-github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ=
-github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-sqlite3 v1.14.11 h1:gt+cp9c0XGqe9S/wAHTL3n/7MqY+siPWgWJgqdsFrzQ=
-github.com/mattn/go-sqlite3 v1.14.11/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
-github.com/minio/highwayhash v1.0.1 h1:dZ6IIu8Z14VlC0VpfKofAhCy74wu/Qb5gcn52yWoz/0=
-github.com/minio/highwayhash v1.0.1/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY=
-github.com/nats-io/jwt/v2 v2.2.1-0.20220113022732-58e87895b296 h1:vU9tpM3apjYlLLeY23zRWJ9Zktr5jp+mloR942LEOpY=
-github.com/nats-io/jwt/v2 v2.2.1-0.20220113022732-58e87895b296/go.mod h1:0tqz9Hlu6bCBFLWAASKhE5vUA4c24L9KPUUgvwumE/k=
-github.com/nats-io/nats-server/v2 v2.7.0 h1:UpqcAM93FI7AHlCyI2FD5QcV3QuHNCauQF2LBVU0238=
-github.com/nats-io/nats-server/v2 v2.7.0/go.mod h1:cjxtMhZsZovK1XS2iiapCduR8HuqB/YpFamL0qntIcw=
-github.com/nats-io/nats.go v1.13.1-0.20211122170419-d7c1d78a50fc h1:SHr4MUUZJ/fAC0uSm2OzWOJYsHpapmR86mpw7q1qPXU=
-github.com/nats-io/nats.go v1.13.1-0.20211122170419-d7c1d78a50fc/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w=
-github.com/nats-io/nkeys v0.3.0 h1:cgM5tL53EvYRU+2YLXIK0G2mJtK12Ft9oeooSZMA2G8=
-github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/labstack/echo/v4 v4.11.1 h1:dEpLU2FLg4UVmvCGPuk/APjlH6GDpbEPti61srUUUs4=
+github.com/labstack/echo/v4 v4.11.1/go.mod h1:YuYRTSM3CHs2ybfrL8Px48bO6BAnYIN4l8wSTMP6BDQ=
+github.com/labstack/gommon v0.4.0 h1:y7cvthEAEbU0yHOf4axH8ZG2NH8knB9iNSoTO8dyIk8=
+github.com/labstack/gommon v0.4.0/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM=
+github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
+github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
+github.com/mailgun/raymond/v2 v2.0.48 h1:5dmlB680ZkFG2RN/0lvTAghrSxIESeu9/2aeDqACtjw=
+github.com/mailgun/raymond/v2 v2.0.48/go.mod h1:lsgvL50kgt1ylcFJYZiULi5fjPBkkhNfj4KA0W54Z18=
+github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
+github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
+github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
+github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
+github.com/microcosm-cc/bluemonday v1.0.25 h1:4NEwSfiJ+Wva0VxN5B8OwMicaJvD8r9tlJWm9rtloEg=
+github.com/microcosm-cc/bluemonday v1.0.25/go.mod h1:ZIOjCQp1OrzBBPIJmfX4qDYFuhU02nx4bn030ixfHLE=
+github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g=
+github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/nats-io/jwt/v2 v2.5.0 h1:WQQ40AAlqqfx+f6ku+i0pOVm+ASirD4fUh+oQsiE9Ak=
+github.com/nats-io/nats-server/v2 v2.8.4 h1:0jQzze1T9mECg8YZEl8+WYUXb9JKluJfCBriPUtluB4=
+github.com/nats-io/nats-server/v2 v2.8.4/go.mod h1:8zZa+Al3WsESfmgSs98Fi06dRWLH5Bnq90m5bKD/eT4=
+github.com/nats-io/nats.go v1.30.2 h1:aloM0TGpPorZKQhbAkdCzYDj+ZmsJDyeo3Gkbr72NuY=
+github.com/nats-io/nats.go v1.30.2/go.mod h1:dcfhUgmQNN4GJEfIb2f9R7Fow+gzBF4emzDHrVBd5qM=
+github.com/nats-io/nkeys v0.4.5 h1:Zdz2BUlFm4fJlierwvGK+yl20IAKUm7eV6AAZXEhkPk=
+github.com/nats-io/nkeys v0.4.5/go.mod h1:XUkxdLPTufzlihbamfzQ7mw/VGx6ObUs+0bN5sNvt64=
 github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
+github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
+github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q=
+github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY=
+github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw=
+github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI=
+github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY=
+github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY=
+github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
+github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
+github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
+github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
+github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/sanity-io/litter v1.5.5 h1:iE+sBxPBzoK6uaEP5Lt3fHNgpKcHXc/A2HGETy0uJQo=
+github.com/schollz/closestmatch v2.1.0+incompatible h1:Uel2GXEpJqOWBrlyI+oY9LTiyyjYS17cCYRqP13/SHk=
+github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtmuhtR2uUrrJOpYzYRvbcPAid+g=
+github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
+github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
+github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
+github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0=
+github.com/stmcginnis/gofish v0.14.0 h1:geECNAiG33JDB2x2xDkerpOOuXFqxp5YP3EFE3vd5iM=
+github.com/stmcginnis/gofish v0.14.0/go.mod h1:BLDSFTp8pDlf/xDbLZa+F7f7eW0E/CHCboggsu8CznI=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/tdewolff/minify/v2 v2.12.9 h1:dvn5MtmuQ/DFMwqf5j8QhEVpPX6fi3WGImhv8RUB4zA=
+github.com/tdewolff/minify/v2 v2.12.9/go.mod h1:qOqdlDfL+7v0/fyymB+OP497nIxJYSvX4MQWA8OoiXU=
+github.com/tdewolff/parse/v2 v2.6.8 h1:mhNZXYCx//xG7Yq2e/kVLNZw4YfYmeHbhx+Zc0OvFMA=
+github.com/tdewolff/parse/v2 v2.6.8/go.mod h1:XHDhaU6IBgsryfdnpzUXBlT6leW/l25yrFBTEb4eIyM=
+github.com/tdewolff/test v1.0.9 h1:SswqJCmeN4B+9gEAi/5uqT0qpi1y2/2O47V/1hhGZT0=
+github.com/tdewolff/test v1.0.9/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE=
+github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
+github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
+github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=
+github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
+github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
+github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
+github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
+github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
+github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
 github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
+github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
+github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
+github.com/vmihailenco/msgpack/v5 v5.4.0 h1:hRM0digJwyR6vll33NNAwCFguy5JuBD6jxDmQP3l608=
+github.com/vmihailenco/msgpack/v5 v5.4.0/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok=
+github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
+github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
+github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
+github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
+github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0 h1:6fRhSjgLCkTD3JnJxvaJ4Sj+TYblw757bqYgZaOq5ZY=
+github.com/yosssi/ace v0.0.5 h1:tUkIP/BLdKqrlrPwcmH0shwEEhTRHoGnc1wFIWmaBUA=
+github.com/yosssi/ace v0.0.5/go.mod h1:ALfIzm2vT7t5ZE7uoIZqF3TQ7SAOyupFZnkrF5id+K0=
+github.com/yudai/gojsondiff v1.0.0 h1:27cbfqXLVEJ1o8I6v3y9lg8Ydm53EKqHXAOMxEGlCOA=
+github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 h1:BHyfKlQyqbsFN5p3IfnEUduWvb9is428/nNb5L3U01M=
+github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+golang.design/x/thread v0.0.0-20210122121316-335e9adffdf1 h1:P7S/GeHBAFEZIYp0ePPs2kHXoazz8q2KsyxHyQVGCJg=
+golang.design/x/thread v0.0.0-20210122121316-335e9adffdf1/go.mod h1:9CWpnTUmlQkfdpdutA1nNf4iE5lAVt3QZOu0Z6hahBE=
+golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
+golang.org/x/arch v0.5.0 h1:jpGode6huXQxcskEIpOCvrU+tzo81b6+oFLUYXWtH/Y=
+golang.org/x/arch v0.5.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
-golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce h1:Roh6XWxHFKrPgC/EQhVubSAGQ6Ozk6IdxHSzt1mR0EI=
-golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
+golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
+golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
+golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
+golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 h1:CIJ76btIcR3eFI5EgSo6k1qKw9KJexJuRLI9G7Hp5wE=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.16.0 h1:7eBu7KsSvFDtSXUIDbh3aqlK4DPsZ1rByC8PFfBThos=
+golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210122093101-04d7465088b8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0=
-golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 h1:GZokNIeuVkl3aZHJchRrr13WCsols02MLUcz1U9is6M=
-golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
+golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
-google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-gopkg.in/Knetic/govaluate.v2 v2.3.0 h1:naJVc9CZlWA8rC8f5mvECJD7jreTrn7FvGXjBthkHJQ=
-gopkg.in/Knetic/govaluate.v2 v2.3.0/go.mod h1:NW0gr10J8s7aNghEg6uhdxiEaBvc0+8VgJjVViHUKp4=
+google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
+google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
+gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+moul.io/http2curl/v2 v2.3.0 h1:9r3JfDzWPcbIklMOs2TnIFzDYvfAZvjeavG6EzP7jYs=
+nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
+rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
--- a/internal/ccMetric/README.md
+++ b/internal/ccMetric/README.md
@@ -1,32 +0,0 @@
-# ClusterCockpit metrics
-
-As described in the [ClusterCockpit specifications](https://github.com/ClusterCockpit/cc-specifications), the whole ClusterCockpit stack uses metrics in the InfluxDB line protocol format. This is also the input and output format for the ClusterCockpit Metric Collector but internally it uses an extended format while processing, named CCMetric.
-
-It is basically a copy of the [InfluxDB line protocol](https://github.com/influxdata/line-protocol) `MutableMetric` interface with one extension. Besides the tags and fields, it contains a list of meta information (re-using the `Tag` structure of the original protocol):
-
-```golang
-type ccMetric struct {
-    name   string            // same as
-    tags   []*influx.Tag     // original
-    fields []*influx.Field   // Influx
-    tm     time.Time         // line-protocol
-    meta   []*influx.Tag
-}
-
-type CCMetric interface {
-    influx.MutableMetric        // the same functions as defined by influx.MutableMetric
-    RemoveTag(key string)       // this is not published by the original influx.MutableMetric
-    Meta() map[string]string
-    MetaList() []*inlux.Tag
-    AddMeta(key, value string)
-    HasMeta(key string) bool
-    GetMeta(key string) (string, bool)
-    RemoveMeta(key string)
-}
-```
-
-The `CCMetric` interface provides the same functions as the `MutableMetric` like `{Add, Remove, Has}{Tag, Field}` and additionally provides `{Add, Remove, Has}Meta`.
-
-The InfluxDB protocol creates a new metric with `influx.New(name, tags, fields, time)` while CCMetric uses `ccMetric.New(name, tags, meta, fields, time)` where `tags` and `meta` are both of type `map[string]string`.
-
-You can copy a CCMetric with `FromMetric(other CCMetric) CCMetric`. If you get an `influx.Metric` from a function, like the line protocol parser, you can use `FromInfluxMetric(other influx.Metric) CCMetric` to get a CCMetric out of it (see `NatsReceiver` for an example).
--- a/internal/ccMetric/ccMetric.go
+++ b/internal/ccMetric/ccMetric.go
@@ -1,422 +0,0 @@
-package ccmetric
-
-import (
-	"fmt"
-	"sort"
-	"time"
-
-	lp "github.com/influxdata/line-protocol" // MIT license
-)
-
-// Most functions are derived from github.com/influxdata/line-protocol/metric.go
-// The metric type is extended with an extra meta information list re-using the Tag
-// type.
-
-type ccMetric struct {
-	name   string
-	tags   []*lp.Tag
-	fields []*lp.Field
-	tm     time.Time
-	meta   []*lp.Tag
-}
-
-type CCMetric interface {
-	lp.MutableMetric
-	Name() string
-	AddTag(key, value string)
-	GetTag(key string) (string, bool)
-	HasTag(key string) bool
-	RemoveTag(key string)
-	Tags() map[string]string
-	TagList() []*lp.Tag
-	AddMeta(key, value string)
-	GetMeta(key string) (string, bool)
-	HasMeta(key string) bool
-	RemoveMeta(key string)
-	Meta() map[string]string
-	MetaList() []*lp.Tag
-	AddField(key string, value interface{})
-	GetField(key string) (interface{}, bool)
-	HasField(key string) bool
-	RemoveField(key string)
-	Fields() map[string]interface{}
-	FieldList() []*lp.Field
-	String() string
-	SetTime(t time.Time)
-}
-
-func (m *ccMetric) Meta() map[string]string {
-	meta := make(map[string]string, len(m.meta))
-	for _, m := range m.meta {
-		meta[m.Key] = m.Value
-	}
-	return meta
-}
-
-func (m *ccMetric) MetaList() []*lp.Tag {
-	return m.meta
-}
-
-func (m *ccMetric) String() string {
-	return fmt.Sprintf("%s %v %v %v %d", m.name, m.Tags(), m.Meta(), m.Fields(), m.tm.UnixNano())
-}
-
-func (m *ccMetric) Name() string {
-	return m.name
-}
-
-func (m *ccMetric) Tags() map[string]string {
-	tags := make(map[string]string, len(m.tags))
-	for _, tag := range m.tags {
-		tags[tag.Key] = tag.Value
-	}
-	return tags
-}
-
-func (m *ccMetric) TagList() []*lp.Tag {
-	return m.tags
-}
-
-func (m *ccMetric) Fields() map[string]interface{} {
-	fields := make(map[string]interface{}, len(m.fields))
-	for _, field := range m.fields {
-		fields[field.Key] = field.Value
-	}
-
-	return fields
-}
-
-func (m *ccMetric) FieldList() []*lp.Field {
-	return m.fields
-}
-
-func (m *ccMetric) Time() time.Time {
-	return m.tm
-}
-
-func (m *ccMetric) SetTime(t time.Time) {
-	m.tm = t
-}
-
-func (m *ccMetric) HasTag(key string) bool {
-	for _, tag := range m.tags {
-		if tag.Key == key {
-			return true
-		}
-	}
-	return false
-}
-
-func (m *ccMetric) GetTag(key string) (string, bool) {
-	for _, tag := range m.tags {
-		if tag.Key == key {
-			return tag.Value, true
-		}
-	}
-	return "", false
-}
-
-func (m *ccMetric) RemoveTag(key string) {
-	for i, tag := range m.tags {
-		if tag.Key == key {
-			copy(m.tags[i:], m.tags[i+1:])
-			m.tags[len(m.tags)-1] = nil
-			m.tags = m.tags[:len(m.tags)-1]
-			return
-		}
-	}
-}
-
-func (m *ccMetric) AddTag(key, value string) {
-	for i, tag := range m.tags {
-		if key > tag.Key {
-			continue
-		}
-
-		if key == tag.Key {
-			tag.Value = value
-			return
-		}
-
-		m.tags = append(m.tags, nil)
-		copy(m.tags[i+1:], m.tags[i:])
-		m.tags[i] = &lp.Tag{Key: key, Value: value}
-		return
-	}
-
-	m.tags = append(m.tags, &lp.Tag{Key: key, Value: value})
-}
-
-func (m *ccMetric) HasMeta(key string) bool {
-	for _, tag := range m.meta {
-		if tag.Key == key {
-			return true
-		}
-	}
-	return false
-}
-
-func (m *ccMetric) GetMeta(key string) (string, bool) {
-	for _, tag := range m.meta {
-		if tag.Key == key {
-			return tag.Value, true
-		}
-	}
-	return "", false
-}
-
-func (m *ccMetric) RemoveMeta(key string) {
-	for i, tag := range m.meta {
-		if tag.Key == key {
-			copy(m.meta[i:], m.meta[i+1:])
-			m.meta[len(m.meta)-1] = nil
-			m.meta = m.meta[:len(m.meta)-1]
-			return
-		}
-	}
-}
-
-func (m *ccMetric) AddMeta(key, value string) {
-	for i, tag := range m.meta {
-		if key > tag.Key {
-			continue
-		}
-
-		if key == tag.Key {
-			tag.Value = value
-			return
-		}
-
-		m.meta = append(m.meta, nil)
-		copy(m.meta[i+1:], m.meta[i:])
-		m.meta[i] = &lp.Tag{Key: key, Value: value}
-		return
-	}
-
-	m.meta = append(m.meta, &lp.Tag{Key: key, Value: value})
-}
-
-func (m *ccMetric) AddField(key string, value interface{}) {
-	for i, field := range m.fields {
-		if key == field.Key {
-			m.fields[i] = &lp.Field{Key: key, Value: convertField(value)}
-			return
-		}
-	}
-	m.fields = append(m.fields, &lp.Field{Key: key, Value: convertField(value)})
-}
-
-func (m *ccMetric) GetField(key string) (interface{}, bool) {
-	for _, field := range m.fields {
-		if field.Key == key {
-			return field.Value, true
-		}
-	}
-	return "", false
-}
-
-func (m *ccMetric) HasField(key string) bool {
-	for _, field := range m.fields {
-		if field.Key == key {
-			return true
-		}
-	}
-	return false
-}
-
-func (m *ccMetric) RemoveField(key string) {
-	for i, field := range m.fields {
-		if field.Key == key {
-			copy(m.fields[i:], m.fields[i+1:])
-			m.fields[len(m.fields)-1] = nil
-			m.fields = m.fields[:len(m.fields)-1]
-			return
-		}
-	}
-}
-
-func New(
-	name string,
-	tags map[string]string,
-	meta map[string]string,
-	fields map[string]interface{},
-	tm time.Time,
-) (CCMetric, error) {
-	m := &ccMetric{
-		name:   name,
-		tags:   nil,
-		fields: nil,
-		tm:     tm,
-		meta:   nil,
-	}
-
-	if len(tags) > 0 {
-		m.tags = make([]*lp.Tag, 0, len(tags))
-		for k, v := range tags {
-			m.tags = append(m.tags,
-				&lp.Tag{Key: k, Value: v})
-		}
-		sort.Slice(m.tags, func(i, j int) bool { return m.tags[i].Key < m.tags[j].Key })
-	}
-
-	if len(meta) > 0 {
-		m.meta = make([]*lp.Tag, 0, len(meta))
-		for k, v := range meta {
-			m.meta = append(m.meta,
-				&lp.Tag{Key: k, Value: v})
-		}
-		sort.Slice(m.meta, func(i, j int) bool { return m.meta[i].Key < m.meta[j].Key })
-	}
-
-	if len(fields) > 0 {
-		m.fields = make([]*lp.Field, 0, len(fields))
-		for k, v := range fields {
-			v := convertField(v)
-			if v == nil {
-				continue
-			}
-			m.AddField(k, v)
-		}
-	}
-
-	return m, nil
-}
-
-func FromMetric(other CCMetric) CCMetric {
-	m := &ccMetric{
-		name:   other.Name(),
-		tags:   make([]*lp.Tag, len(other.TagList())),
-		fields: make([]*lp.Field, len(other.FieldList())),
-		meta:   make([]*lp.Tag, len(other.MetaList())),
-		tm:     other.Time(),
-	}
-
-	for i, tag := range other.TagList() {
-		m.tags[i] = &lp.Tag{Key: tag.Key, Value: tag.Value}
-	}
-	for i, s := range other.MetaList() {
-		m.meta[i] = &lp.Tag{Key: s.Key, Value: s.Value}
-	}
-
-	for i, field := range other.FieldList() {
-		m.fields[i] = &lp.Field{Key: field.Key, Value: field.Value}
-	}
-	return m
-}
-
-func FromInfluxMetric(other lp.Metric) CCMetric {
-	m := &ccMetric{
-		name:   other.Name(),
-		tags:   make([]*lp.Tag, len(other.TagList())),
-		fields: make([]*lp.Field, len(other.FieldList())),
-		meta:   make([]*lp.Tag, 0),
-		tm:     other.Time(),
-	}
-
-	for i, tag := range other.TagList() {
-		m.tags[i] = &lp.Tag{Key: tag.Key, Value: tag.Value}
-	}
-
-	for i, field := range other.FieldList() {
-		m.fields[i] = &lp.Field{Key: field.Key, Value: field.Value}
-	}
-	return m
-}
-
-func convertField(v interface{}) interface{} {
-	switch v := v.(type) {
-	case float64:
-		return v
-	case int64:
-		return v
-	case string:
-		return v
-	case bool:
-		return v
-	case int:
-		return int64(v)
-	case uint:
-		return uint64(v)
-	case uint64:
-		return uint64(v)
-	case []byte:
-		return string(v)
-	case int32:
-		return int64(v)
-	case int16:
-		return int64(v)
-	case int8:
-		return int64(v)
-	case uint32:
-		return uint64(v)
-	case uint16:
-		return uint64(v)
-	case uint8:
-		return uint64(v)
-	case float32:
-		return float64(v)
-	case *float64:
-		if v != nil {
-			return *v
-		}
-	case *int64:
-		if v != nil {
-			return *v
-		}
-	case *string:
-		if v != nil {
-			return *v
-		}
-	case *bool:
-		if v != nil {
-			return *v
-		}
-	case *int:
-		if v != nil {
-			return int64(*v)
-		}
-	case *uint:
-		if v != nil {
-			return uint64(*v)
-		}
-	case *uint64:
-		if v != nil {
-			return uint64(*v)
-		}
-	case *[]byte:
-		if v != nil {
-			return string(*v)
-		}
-	case *int32:
-		if v != nil {
-			return int64(*v)
-		}
-	case *int16:
-		if v != nil {
-			return int64(*v)
-		}
-	case *int8:
-		if v != nil {
-			return int64(*v)
-		}
-	case *uint32:
-		if v != nil {
-			return uint64(*v)
-		}
-	case *uint16:
-		if v != nil {
-			return uint64(*v)
-		}
-	case *uint8:
-		if v != nil {
-			return uint64(*v)
-		}
-	case *float32:
-		if v != nil {
-			return float64(*v)
-		}
-	default:
-		return nil
-	}
-	return nil
-}
--- a/internal/ccTopology/ccTopology.go
+++ b/internal/ccTopology/ccTopology.go
@@ -1,277 +0,0 @@
-package ccTopology
-
-import (
-	"fmt"
-	"io/ioutil"
-	"log"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-
-	cclogger "github.com/ClusterCockpit/cc-metric-collector/internal/ccLogger"
-)
-
-// intArrayContains scans an array of ints if the value str is present in the array
-// If the specified value is found, the corresponding array index is returned.
-// The bool value is used to signal success or failure
-func intArrayContains(array []int, str int) (int, bool) {
-	for i, a := range array {
-		if a == str {
-			return i, true
-		}
-	}
-	return -1, false
-}
-
-// stringArrayContains scans an array of strings if the value str is present in the array
-// If the specified value is found, the corresponding array index is returned.
-// The bool value is used to signal success or failure
-// func stringArrayContains(array []string, str string) (int, bool) {
-// 	for i, a := range array {
-// 		if a == str {
-// 			return i, true
-// 		}
-// 	}
-// 	return -1, false
-// }
-
-func SocketList() []int {
-	buffer, err := ioutil.ReadFile("/proc/cpuinfo")
-	if err != nil {
-		log.Print(err)
-		return nil
-	}
-	ll := strings.Split(string(buffer), "\n")
-	var packs []int
-	for _, line := range ll {
-		if strings.HasPrefix(line, "physical id") {
-			lv := strings.Fields(line)
-			id, err := strconv.ParseInt(lv[3], 10, 32)
-			if err != nil {
-				log.Print(err)
-				return packs
-			}
-			_, found := intArrayContains(packs, int(id))
-			if !found {
-				packs = append(packs, int(id))
-			}
-		}
-	}
-	return packs
-}
-
-func CpuList() []int {
-	buffer, err := ioutil.ReadFile("/proc/cpuinfo")
-	if err != nil {
-		log.Print(err)
-		return nil
-	}
-	ll := strings.Split(string(buffer), "\n")
-	var cpulist []int
-	for _, line := range ll {
-		if strings.HasPrefix(line, "processor") {
-			lv := strings.Fields(line)
-			id, err := strconv.ParseInt(lv[2], 10, 32)
-			if err != nil {
-				log.Print(err)
-				return cpulist
-			}
-			_, found := intArrayContains(cpulist, int(id))
-			if !found {
-				cpulist = append(cpulist, int(id))
-			}
-		}
-	}
-	return cpulist
-}
-
-type CpuEntry struct {
-	Cpuid      int
-	SMT        int
-	Core       int
-	Socket     int
-	Numadomain int
-	Die        int
-}
-
-func CpuData() []CpuEntry {
-
-	fileToInt := func(path string) int {
-		buffer, err := ioutil.ReadFile(path)
-		if err != nil {
-			log.Print(err)
-			cclogger.ComponentError("ccTopology", "Reading", path, ":", err.Error())
-			return -1
-		}
-		sbuffer := strings.Replace(string(buffer), "\n", "", -1)
-		var id int64
-		//_, err = fmt.Scanf("%d", sbuffer, &id)
-		id, err = strconv.ParseInt(sbuffer, 10, 32)
-		if err != nil {
-			cclogger.ComponentError("ccTopology", "Parsing", path, ":", sbuffer, err.Error())
-			return -1
-		}
-		return int(id)
-	}
-	getCore := func(basepath string) int {
-		return fileToInt(fmt.Sprintf("%s/core_id", basepath))
-	}
-
-	getSocket := func(basepath string) int {
-		return fileToInt(fmt.Sprintf("%s/physical_package_id", basepath))
-	}
-
-	getDie := func(basepath string) int {
-		return fileToInt(fmt.Sprintf("%s/die_id", basepath))
-	}
-
-	getSMT := func(cpuid int, basepath string) int {
-		buffer, err := ioutil.ReadFile(fmt.Sprintf("%s/thread_siblings_list", basepath))
-		if err != nil {
-			log.Print(err)
-		}
-		threadlist := make([]int, 0)
-		sbuffer := strings.Replace(string(buffer), "\n", "", -1)
-		for _, x := range strings.Split(sbuffer, ",") {
-			id, err := strconv.ParseInt(x, 10, 32)
-			if err != nil {
-				log.Print(err)
-			}
-			threadlist = append(threadlist, int(id))
-		}
-		for i, x := range threadlist {
-			if x == cpuid {
-				return i
-			}
-		}
-		return 1
-	}
-
-	getNumaDomain := func(basepath string) int {
-		files, err := filepath.Glob(fmt.Sprintf("%s/node*", basepath))
-		if err != nil {
-			log.Print(err)
-		}
-		for _, f := range files {
-			finfo, err := os.Lstat(f)
-			if err == nil && (finfo.IsDir() || finfo.Mode()&os.ModeSymlink != 0) {
-				var id int
-				parts := strings.Split(f, "/")
-				_, err = fmt.Scanf("node%d", parts[len(parts)-1], &id)
-				if err == nil {
-					return id
-				}
-			}
-		}
-		return 0
-	}
-
-	clist := make([]CpuEntry, 0)
-	for _, c := range CpuList() {
-		clist = append(clist, CpuEntry{Cpuid: c})
-	}
-	for _, centry := range clist {
-		centry.Socket = -1
-		centry.Numadomain = -1
-		centry.Die = -1
-		centry.Core = -1
-		// Set base directory for topology lookup
-		base := fmt.Sprintf("/sys/devices/system/cpu/cpu%d/topology", centry.Cpuid)
-
-		// Lookup CPU core id
-		centry.Core = getCore(base)
-
-		// Lookup CPU socket id
-		centry.Socket = getSocket(base)
-
-		// Lookup CPU die id
-		centry.Die = getDie(base)
-
-		// Lookup SMT thread id
-		centry.SMT = getSMT(centry.Cpuid, base)
-
-		// Lookup NUMA domain id
-		centry.Numadomain = getNumaDomain(base)
-
-	}
-	return clist
-}
-
-type CpuInformation struct {
-	NumHWthreads   int
-	SMTWidth       int
-	NumSockets     int
-	NumDies        int
-	NumNumaDomains int
-}
-
-func CpuInfo() CpuInformation {
-	var c CpuInformation
-
-	smt := 0
-	numa := 0
-	die := 0
-	socket := 0
-	cdata := CpuData()
-	for _, d := range cdata {
-		if d.SMT > smt {
-			smt = d.SMT
-		}
-		if d.Numadomain > numa {
-			numa = d.Numadomain
-		}
-		if d.Die > die {
-			die = d.Die
-		}
-		if d.Socket > socket {
-			socket = d.Socket
-		}
-	}
-	c.NumNumaDomains = numa + 1
-	c.SMTWidth = smt + 1
-	c.NumDies = die + 1
-	c.NumSockets = socket + 1
-	c.NumHWthreads = len(cdata)
-	return c
-}
-
-func GetCpuSocket(cpuid int) int {
-	cdata := CpuData()
-	for _, d := range cdata {
-		if d.Cpuid == cpuid {
-			return d.Socket
-		}
-	}
-	return -1
-}
-
-func GetCpuNumaDomain(cpuid int) int {
-	cdata := CpuData()
-	for _, d := range cdata {
-		if d.Cpuid == cpuid {
-			return d.Numadomain
-		}
-	}
-	return -1
-}
-
-func GetCpuDie(cpuid int) int {
-	cdata := CpuData()
-	for _, d := range cdata {
-		if d.Cpuid == cpuid {
-			return d.Die
-		}
-	}
-	return -1
-}
-
-func GetCpuCore(cpuid int) int {
-	cdata := CpuData()
-	for _, d := range cdata {
-		if d.Cpuid == cpuid {
-			return d.Core
-		}
-	}
-	return -1
-}
--- a/internal/metricAggregator/README.md
+++ b/internal/metricAggregator/README.md
@@ -0,0 +1,38 @@
+# The MetricAggregator
+
+In some cases, further combination of metrics or raw values is required. For that strings like `foo + 1` with runtime dependent `foo` need to be evaluated. The MetricAggregator relies on the [`gval`](https://github.com/PaesslerAG/gval) Golang package to perform all expression evaluation. The `gval` package provides the basic arithmetic operations but the MetricAggregator defines additional ones.
+
+**Note**: To get an impression which expressions can be handled by `gval`, see its [README](https://github.com/PaesslerAG/gval/blob/master/README.md)
+
+## Simple expression evaluation
+
+For simple expression evaluation, the MetricAggregator provides two function for different use-cases:
+- `EvalBoolCondition(expression string, params map[string]interface{}`: Used by the MetricRouter to match metrics like `metric.Name() == 'mymetric'`
+- `EvalFloat64Condition(expression string, params map[string]interface{})`: Used by the MetricRouter and LikwidCollector to derive new values like `(PMC0+PMC1)/PMC3`
+
+## MetricAggregator extensions for `gval`
+
+The MetricAggregator provides these functions additional to the `Full` language in `gval`:
+- `sum(array)`: Sum up values in an array like `sum(values)`
+- `min(array)`: Get the minimum value in an array like `min(values)`
+- `avg(array)`: Get the mean value in an array like `avg(values)`
+- `mean(array)`: Get the mean value in an array like `mean(values)`
+- `max(array)`: Get the maximum value in an array like `max(values)`
+- `len(array)`: Get the length of an array like `len(values)`
+- `median(array)`: Get the median value in an array like `mean(values)`
+- `in`: Check existence in an array like `0 in getCpuList()` to check whether there is an entry `0`. Also substring matching works like `temp in metric.Name()`
+- `match`: Regular-expression matching like `match('temp_cores_%d+', metric.Name())`. **Note** all `\` in an regex has to be replaced with `%`
+- `getCpuCore(cpuid)`: For a CPU id, the the corresponding CPU core id like `getCpuCore(0)`
+- `getCpuSocket(cpuid)`: For a CPU id, the the corresponding CPU socket id
+- `getCpuNuma(cpuid)`: For a CPU id, the the corresponding NUMA domain id
+- `getCpuDie(cpuid)`: For a CPU id, the the corresponding CPU die id
+- `getSockCpuList(sockid)`: For a given CPU socket id, the list of CPU ids is returned like the CPUs on socket 1 `getSockCpuList(1)`
+- `getNumaCpuList(numaid)`: For a given NUMA node id, the list of CPU ids is returned
+- `getDieCpuList(dieid)`: For a given CPU die id, the list of CPU ids is returned
+- `getCoreCpuList(coreid)`: For a given CPU core id, the list of CPU ids is returned
+- `getCpuList`: Get the list of all CPUs
+
+## Limitations
+
+- Since the metrics are written in JSON files which do not allow `""` without proper escaping inside of JSON strings, you have to use `''` for strings.
+- Since `\` is interpreted by JSON as escape character, it cannot be used in metrics. But it is required to write regular expressions. So instead of `/`, use `%` and the MetricAggregator replaces them after reading the JSON file.
--- a/internal/metricAggregator/metricAggregator.go
+++ b/internal/metricAggregator/metricAggregator.go
@@ -1,21 +1,23 @@
-package metricRouter
+package metricAggregator

 import (
 	"context"
 	"fmt"
+	"math"
 	"os"
 	"strings"
+	"sync"
 	"time"

-	cclog "github.com/ClusterCockpit/cc-metric-collector/internal/ccLogger"
+	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"

-	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
-	topo "github.com/ClusterCockpit/cc-metric-collector/internal/ccTopology"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
+	topo "github.com/ClusterCockpit/cc-metric-collector/pkg/ccTopology"

 	"github.com/PaesslerAG/gval"
 )

-type metricAggregatorIntervalConfig struct {
+type MetricAggregatorIntervalConfig struct {
 	Name      string            `json:"name"`     // Metric name for the new metric
 	Function  string            `json:"function"` // Function to apply on the metric
 	Condition string            `json:"if"`       // Condition for applying function
@@ -26,7 +28,7 @@ type metricAggregatorIntervalConfig struct {
 }

 type metricAggregator struct {
-	functions []*metricAggregatorIntervalConfig
+	functions []*MetricAggregatorIntervalConfig
 	constants map[string]interface{}
 	language  gval.Language
 	output    chan lp.CCMetric
@@ -61,10 +63,20 @@ var metricCacheLanguage = gval.NewLanguage(
 	gval.Function("getCpuList", getCpuListOfNode),
 	gval.Function("getCpuListOfType", getCpuListOfType),
 )
+var language gval.Language = gval.NewLanguage(
+	gval.Full(),
+	metricCacheLanguage,
+)
+var evaluables = struct {
+	mapping map[string]gval.Evaluable
+	mutex   sync.Mutex
+}{
+	mapping: make(map[string]gval.Evaluable),
+}

 func (c *metricAggregator) Init(output chan lp.CCMetric) error {
 	c.output = output
-	c.functions = make([]*metricAggregatorIntervalConfig, 0)
+	c.functions = make([]*MetricAggregatorIntervalConfig, 0)
 	c.constants = make(map[string]interface{})

 	// add constants like hostname, numSockets, ... to constants list
@@ -84,7 +96,7 @@ func (c *metricAggregator) Init(output chan lp.CCMetric) error {
 	c.constants["smtWidth"] = cinfo.SMTWidth

 	c.language = gval.NewLanguage(
-		gval.Base(),
+		gval.Full(),
 		metricCacheLanguage,
 	)

@@ -109,7 +121,12 @@ func (c *metricAggregator) Eval(starttime time.Time, endtime time.Time, metrics
 	vars["endtime"] = endtime
 	for _, f := range c.functions {
 		cclog.ComponentDebug("MetricCache", "COLLECT", f.Name, "COND", f.Condition)
-		values := make([]float64, 0)
+		var valuesFloat64 []float64
+		var valuesFloat32 []float32
+		var valuesInt []int
+		var valuesInt32 []int32
+		var valuesInt64 []int64
+		var valuesBool []bool
 		matches := make([]lp.CCMetric, 0)
 		for _, m := range metrics {
 			vars["metric"] = m
@@ -124,17 +141,17 @@ func (c *metricAggregator) Eval(starttime time.Time, endtime time.Time, metrics
 				if valid {
 					switch x := v.(type) {
 					case float64:
-						values = append(values, x)
+						valuesFloat64 = append(valuesFloat64, x)
 					case float32:
+						valuesFloat32 = append(valuesFloat32, x)
 					case int:
+						valuesInt = append(valuesInt, x)
+					case int32:
+						valuesInt32 = append(valuesInt32, x)
 					case int64:
-						values = append(values, float64(x))
+						valuesInt64 = append(valuesInt64, x)
 					case bool:
-						if x {
-							values = append(values, float64(1.0))
-						} else {
-							values = append(values, float64(0.0))
-						}
+						valuesBool = append(valuesBool, x)
 					default:
 						cclog.ComponentError("MetricCache", "COLLECT ADD VALUE", v, "FAILED")
 					}
@@ -143,13 +160,59 @@ func (c *metricAggregator) Eval(starttime time.Time, endtime time.Time, metrics
 			}
 		}
 		delete(vars, "metric")
-		cclog.ComponentDebug("MetricCache", "EVALUATE", f.Name, "METRICS", len(values), "CALC", f.Function)
-		vars["values"] = values
+
+		// Check, that only values of one type were collected
+		countValueTypes := 0
+		if len(valuesFloat64) > 0 {
+			countValueTypes += 1
+		}
+		if len(valuesFloat32) > 0 {
+			countValueTypes += 1
+		}
+		if len(valuesInt) > 0 {
+			countValueTypes += 1
+		}
+		if len(valuesInt32) > 0 {
+			countValueTypes += 1
+		}
+		if len(valuesInt64) > 0 {
+			countValueTypes += 1
+		}
+		if len(valuesBool) > 0 {
+			countValueTypes += 1
+		}
+		if countValueTypes > 1 {
+			cclog.ComponentError("MetricCache", "Collected values of different types")
+		}
+
+		var len_values int
+		switch {
+		case len(valuesFloat64) > 0:
+			vars["values"] = valuesFloat64
+			len_values = len(valuesFloat64)
+		case len(valuesFloat32) > 0:
+			vars["values"] = valuesFloat32
+			len_values = len(valuesFloat32)
+		case len(valuesInt) > 0:
+			vars["values"] = valuesInt
+			len_values = len(valuesInt)
+		case len(valuesInt32) > 0:
+			vars["values"] = valuesInt32
+			len_values = len(valuesInt32)
+		case len(valuesInt64) > 0:
+			vars["values"] = valuesInt64
+			len_values = len(valuesInt64)
+		case len(valuesBool) > 0:
+			vars["values"] = valuesBool
+			len_values = len(valuesBool)
+		}
+		cclog.ComponentDebug("MetricCache", "EVALUATE", f.Name, "METRICS", len_values, "CALC", f.Function)
+
 		vars["metrics"] = matches
-		if len(values) > 0 {
+		if len_values > 0 {
 			value, err := gval.Evaluate(f.Function, vars, c.language)
 			if err != nil {
-				cclog.ComponentError("MetricCache", "EVALUATE", f.Name, "METRICS", len(values), "CALC", f.Function, ":", err.Error())
+				cclog.ComponentError("MetricCache", "EVALUATE", f.Name, "METRICS", len_values, "CALC", f.Function, ":", err.Error())
 				break
 			}

@@ -245,15 +308,16 @@ func (c *metricAggregator) AddAggregation(name, function, condition string, tags
 			return nil
 		}
 	}
-	var agg metricAggregatorIntervalConfig
-	agg.Name = name
-	agg.Condition = newcond
-	agg.gvalCond = gvalCond
-	agg.Function = newfunc
-	agg.gvalFunc = gvalFunc
-	agg.Tags = tags
-	agg.Meta = meta
-	c.functions = append(c.functions, &agg)
+	agg := &MetricAggregatorIntervalConfig{
+		Name:      name,
+		Condition: newcond,
+		gvalCond:  gvalCond,
+		Function:  newfunc,
+		gvalFunc:  gvalFunc,
+		Tags:      tags,
+		Meta:      meta,
+	}
+	c.functions = append(c.functions, agg)
 	return nil
 }

@@ -281,6 +345,50 @@ func (c *metricAggregator) AddFunction(name string, function func(args ...interf
 	c.language = gval.NewLanguage(c.language, gval.Function(name, function))
 }

+func EvalBoolCondition(condition string, params map[string]interface{}) (bool, error) {
+	evaluables.mutex.Lock()
+	evaluable, ok := evaluables.mapping[condition]
+	evaluables.mutex.Unlock()
+	if !ok {
+		newcond :=
+			strings.ReplaceAll(
+				strings.ReplaceAll(
+					condition, "'", "\""), "%", "\\")
+		var err error
+		evaluable, err = language.NewEvaluable(newcond)
+		if err != nil {
+			return false, err
+		}
+		evaluables.mutex.Lock()
+		evaluables.mapping[condition] = evaluable
+		evaluables.mutex.Unlock()
+	}
+	value, err := evaluable.EvalBool(context.Background(), params)
+	return value, err
+}
+
+func EvalFloat64Condition(condition string, params map[string]float64) (float64, error) {
+	evaluables.mutex.Lock()
+	evaluable, ok := evaluables.mapping[condition]
+	evaluables.mutex.Unlock()
+	if !ok {
+		newcond :=
+			strings.ReplaceAll(
+				strings.ReplaceAll(
+					condition, "'", "\""), "%", "\\")
+		var err error
+		evaluable, err = language.NewEvaluable(newcond)
+		if err != nil {
+			return math.NaN(), err
+		}
+		evaluables.mutex.Lock()
+		evaluables.mapping[condition] = evaluable
+		evaluables.mutex.Unlock()
+	}
+	value, err := evaluable.EvalFloat64(context.Background(), params)
+	return value, err
+}
+
 func NewAggregator(output chan lp.CCMetric) (MetricAggregator, error) {
 	a := new(metricAggregator)
 	err := a.Init(output)
--- a/internal/metricAggregator/metricAggregatorFunctions.go
+++ b/internal/metricAggregator/metricAggregatorFunctions.go
@@ -1,164 +1,169 @@
-package metricRouter
+package metricAggregator

 import (
 	"errors"
 	"fmt"
-	"math"
 	"regexp"
-	"sort"
 	"strings"

-	cclog "github.com/ClusterCockpit/cc-metric-collector/internal/ccLogger"
-	topo "github.com/ClusterCockpit/cc-metric-collector/internal/ccTopology"
+	"golang.org/x/exp/slices"
+
+	topo "github.com/ClusterCockpit/cc-metric-collector/pkg/ccTopology"
 )

 /*
 * Arithmetic functions on value arrays
 */

-// Sum up values
-func sumfunc(args ...interface{}) (interface{}, error) {
-	s := 0.0
-	values, ok := args[0].([]float64)
-	if ok {
-		cclog.ComponentDebug("MetricCache", "SUM FUNC START")
-		for _, x := range values {
-			s += x
-		}
-		cclog.ComponentDebug("MetricCache", "SUM FUNC END", s)
-	} else {
-		cclog.ComponentDebug("MetricCache", "SUM FUNC CAST FAILED")
+func sumAnyType[T float64 | float32 | int | int32 | int64](values []T) (T, error) {
+	if len(values) == 0 {
+		return 0.0, errors.New("sum function requires at least one argument")
 	}
-	return s, nil
+	var sum T
+	for _, value := range values {
+		sum += value
+	}
+	return sum, nil
 }

-// Get the minimum value
-func minfunc(args ...interface{}) (interface{}, error) {
-	var err error = nil
-	switch values := args[0].(type) {
+// Sum up values
+func sumfunc(args interface{}) (interface{}, error) {
+
+	var err error
+	switch values := args.(type) {
 	case []float64:
-		var s float64 = math.MaxFloat64
-		for _, x := range values {
-			if x < s {
-				s = x
-			}
-		}
-		return s, nil
+		return sumAnyType(values)
 	case []float32:
-		var s float32 = math.MaxFloat32
-		for _, x := range values {
-			if x < s {
-				s = x
-			}
-		}
-		return s, nil
+		return sumAnyType(values)
 	case []int:
-		var s int = int(math.MaxInt32)
-		for _, x := range values {
-			if x < s {
-				s = x
-			}
-		}
-		return s, nil
+		return sumAnyType(values)
 	case []int64:
-		var s int64 = math.MaxInt64
-		for _, x := range values {
-			if x < s {
-				s = x
-			}
-		}
-		return s, nil
+		return sumAnyType(values)
 	case []int32:
-		var s int32 = math.MaxInt32
-		for _, x := range values {
-			if x < s {
-				s = x
-			}
-		}
-		return s, nil
+		return sumAnyType(values)
 	default:
-		err = errors.New("function 'min' only on list of values (float64, float32, int, int32, int64)")
+		err = errors.New("function 'sum' only on list of values (float64, float32, int, int32, int64)")
 	}

 	return 0.0, err
 }

-// Get the average or mean value
-func avgfunc(args ...interface{}) (interface{}, error) {
-	switch values := args[0].(type) {
-	case []float64:
-		var s float64 = 0
-		for _, x := range values {
-			s += x
-		}
-		return s / float64(len(values)), nil
-	case []float32:
-		var s float32 = 0
-		for _, x := range values {
-			s += x
-		}
-		return s / float32(len(values)), nil
-	case []int:
-		var s int = 0
-		for _, x := range values {
-			s += x
-		}
-		return s / len(values), nil
-	case []int64:
-		var s int64 = 0
-		for _, x := range values {
-			s += x
-		}
-		return s / int64(len(values)), nil
+func minAnyType[T float64 | float32 | int | int32 | int64](values []T) (T, error) {
+	if len(values) == 0 {
+		return 0.0, errors.New("min function requires at least one argument")
 	}
-	return 0.0, nil
+	return slices.Min(values), nil
+}
+
+// Get the minimum value
+func minfunc(args interface{}) (interface{}, error) {
+	switch values := args.(type) {
+	case []float64:
+		return minAnyType(values)
+	case []float32:
+		return minAnyType(values)
+	case []int:
+		return minAnyType(values)
+	case []int64:
+		return minAnyType(values)
+	case []int32:
+		return minAnyType(values)
+	default:
+		return 0.0, errors.New("function 'min' only on list of values (float64, float32, int, int32, int64)")
+	}
+}
+
+func avgAnyType[T float64 | float32 | int | int32 | int64](values []T) (float64, error) {
+	if len(values) == 0 {
+		return 0.0, errors.New("average function requires at least one argument")
+	}
+	sum, err := sumAnyType[T](values)
+	return float64(sum) / float64(len(values)), err
+}
+
+// Get the average or mean value
+func avgfunc(args interface{}) (interface{}, error) {
+	switch values := args.(type) {
+	case []float64:
+		return avgAnyType(values)
+	case []float32:
+		return avgAnyType(values)
+	case []int:
+		return avgAnyType(values)
+	case []int64:
+		return avgAnyType(values)
+	case []int32:
+		return avgAnyType(values)
+	default:
+		return 0.0, errors.New("function 'average' only on list of values (float64, float32, int, int32, int64)")
+	}
+}
+
+func maxAnyType[T float64 | float32 | int | int32 | int64](values []T) (T, error) {
+	if len(values) == 0 {
+		return 0.0, errors.New("max function requires at least one argument")
+	}
+	return slices.Max(values), nil
 }

 // Get the maximum value
-func maxfunc(args ...interface{}) (interface{}, error) {
-	s := 0.0
-	values, ok := args[0].([]float64)
-	if ok {
-		for _, x := range values {
-			if x > s {
-				s = x
-			}
-		}
+func maxfunc(args interface{}) (interface{}, error) {
+	switch values := args.(type) {
+	case []float64:
+		return maxAnyType(values)
+	case []float32:
+		return maxAnyType(values)
+	case []int:
+		return maxAnyType(values)
+	case []int64:
+		return maxAnyType(values)
+	case []int32:
+		return maxAnyType(values)
+	default:
+		return 0.0, errors.New("function 'max' only on list of values (float64, float32, int, int32, int64)")
 	}
-	return s, nil
+}
+
+func medianAnyType[T float64 | float32 | int | int32 | int64](values []T) (T, error) {
+	if len(values) == 0 {
+		return 0.0, errors.New("median function requires at least one argument")
+	}
+	slices.Sort(values)
+	var median T
+	if midPoint := len(values) % 2; midPoint == 0 {
+		median = (values[midPoint-1] + values[midPoint]) / 2
+	} else {
+		median = values[midPoint]
+	}
+	return median, nil
 }

 // Get the median value
-func medianfunc(args ...interface{}) (interface{}, error) {
-	switch values := args[0].(type) {
+func medianfunc(args interface{}) (interface{}, error) {
+	switch values := args.(type) {
 	case []float64:
-		sort.Float64s(values)
-		return values[len(values)/2], nil
-	// case []float32:
-	// 	sort.Float64s(values)
-	// 	return values[len(values)/2], nil
+		return medianAnyType(values)
+	case []float32:
+		return medianAnyType(values)
 	case []int:
-		sort.Ints(values)
-		return values[len(values)/2], nil
-
-		// case []int64:
-		// 	sort.Ints(values)
-		// 	return values[len(values)/2], nil
-		// case []int32:
-		// 	sort.Ints(values)
-		// 	return values[len(values)/2], nil
+		return medianAnyType(values)
+	case []int64:
+		return medianAnyType(values)
+	case []int32:
+		return medianAnyType(values)
+	default:
+		return 0.0, errors.New("function 'median' only on list of values (float64, float32, int, int32, int64)")
 	}
-	return 0.0, errors.New("function 'median()' only on lists of type float64 and int")
 }

 /*
 * Get number of values in list. Returns always an int
 */

-func lenfunc(args ...interface{}) (interface{}, error) {
+func lenfunc(args interface{}) (interface{}, error) {
 	var err error = nil
 	var length int = 0
-	switch values := args[0].(type) {
+	switch values := args.(type) {
 	case []float64:
 		length = len(values)
 	case []float32:
@@ -243,49 +248,49 @@ func matchfunc(args ...interface{}) (interface{}, error) {
 */

 // for a given cpuid, it returns the core id
-func getCpuCoreFunc(args ...interface{}) (interface{}, error) {
-	switch cpuid := args[0].(type) {
+func getCpuCoreFunc(args interface{}) (interface{}, error) {
+	switch cpuid := args.(type) {
 	case int:
-		return topo.GetCpuCore(cpuid), nil
+		return topo.GetHwthreadCore(cpuid), nil
 	}
 	return -1, errors.New("function 'getCpuCore' accepts only an 'int' cpuid")
 }

 // for a given cpuid, it returns the socket id
-func getCpuSocketFunc(args ...interface{}) (interface{}, error) {
-	switch cpuid := args[0].(type) {
+func getCpuSocketFunc(args interface{}) (interface{}, error) {
+	switch cpuid := args.(type) {
 	case int:
-		return topo.GetCpuSocket(cpuid), nil
+		return topo.GetHwthreadSocket(cpuid), nil
 	}
 	return -1, errors.New("function 'getCpuCore' accepts only an 'int' cpuid")
 }

 // for a given cpuid, it returns the id of the NUMA node
-func getCpuNumaDomainFunc(args ...interface{}) (interface{}, error) {
-	switch cpuid := args[0].(type) {
+func getCpuNumaDomainFunc(args interface{}) (interface{}, error) {
+	switch cpuid := args.(type) {
 	case int:
-		return topo.GetCpuNumaDomain(cpuid), nil
+		return topo.GetHwthreadNumaDomain(cpuid), nil
 	}
 	return -1, errors.New("function 'getCpuNuma' accepts only an 'int' cpuid")
 }

 // for a given cpuid, it returns the id of the CPU die
-func getCpuDieFunc(args ...interface{}) (interface{}, error) {
-	switch cpuid := args[0].(type) {
+func getCpuDieFunc(args interface{}) (interface{}, error) {
+	switch cpuid := args.(type) {
 	case int:
-		return topo.GetCpuDie(cpuid), nil
+		return topo.GetHwthreadDie(cpuid), nil
 	}
 	return -1, errors.New("function 'getCpuDie' accepts only an 'int' cpuid")
 }

 // for a given core id, it returns the list of cpuids
-func getCpuListOfCoreFunc(args ...interface{}) (interface{}, error) {
+func getCpuListOfCoreFunc(args interface{}) (interface{}, error) {
 	cpulist := make([]int, 0)
-	switch in := args[0].(type) {
+	switch in := args.(type) {
 	case int:
 		for _, c := range topo.CpuData() {
 			if c.Core == in {
-				cpulist = append(cpulist, c.Cpuid)
+				cpulist = append(cpulist, c.CpuID)
 			}
 		}
 	}
@@ -293,13 +298,13 @@ func getCpuListOfCoreFunc(args ...interface{}) (interface{}, error) {
 }

 // for a given socket id, it returns the list of cpuids
-func getCpuListOfSocketFunc(args ...interface{}) (interface{}, error) {
+func getCpuListOfSocketFunc(args interface{}) (interface{}, error) {
 	cpulist := make([]int, 0)
-	switch in := args[0].(type) {
+	switch in := args.(type) {
 	case int:
 		for _, c := range topo.CpuData() {
 			if c.Socket == in {
-				cpulist = append(cpulist, c.Cpuid)
+				cpulist = append(cpulist, c.CpuID)
 			}
 		}
 	}
@@ -307,13 +312,13 @@ func getCpuListOfSocketFunc(args ...interface{}) (interface{}, error) {
 }

 // for a given id of a NUMA domain, it returns the list of cpuids
-func getCpuListOfNumaDomainFunc(args ...interface{}) (interface{}, error) {
+func getCpuListOfNumaDomainFunc(args interface{}) (interface{}, error) {
 	cpulist := make([]int, 0)
-	switch in := args[0].(type) {
+	switch in := args.(type) {
 	case int:
 		for _, c := range topo.CpuData() {
-			if c.Numadomain == in {
-				cpulist = append(cpulist, c.Cpuid)
+			if c.NumaDomain == in {
+				cpulist = append(cpulist, c.CpuID)
 			}
 		}
 	}
@@ -321,13 +326,13 @@ func getCpuListOfNumaDomainFunc(args ...interface{}) (interface{}, error) {
 }

 // for a given CPU die id, it returns the list of cpuids
-func getCpuListOfDieFunc(args ...interface{}) (interface{}, error) {
+func getCpuListOfDieFunc(args interface{}) (interface{}, error) {
 	cpulist := make([]int, 0)
-	switch in := args[0].(type) {
+	switch in := args.(type) {
 	case int:
 		for _, c := range topo.CpuData() {
 			if c.Die == in {
-				cpulist = append(cpulist, c.Cpuid)
+				cpulist = append(cpulist, c.CpuID)
 			}
 		}
 	}
@@ -335,8 +340,8 @@ func getCpuListOfDieFunc(args ...interface{}) (interface{}, error) {
 }

 // wrapper function to get a list of all cpuids of the node
-func getCpuListOfNode(args ...interface{}) (interface{}, error) {
-	return topo.CpuList(), nil
+func getCpuListOfNode() (interface{}, error) {
+	return topo.HwthreadList(), nil
 }

 // helper function to get the cpuid list for a CCMetric type tag set (type and type-id)
@@ -348,14 +353,14 @@ func getCpuListOfType(args ...interface{}) (interface{}, error) {
 	case string:
 		switch typ {
 		case "node":
-			return topo.CpuList(), nil
+			return topo.HwthreadList(), nil
 		case "socket":
 			return getCpuListOfSocketFunc(args[1])
 		case "numadomain":
 			return getCpuListOfNumaDomainFunc(args[1])
 		case "core":
 			return getCpuListOfCoreFunc(args[1])
-		case "cpu":
+		case "hwthread":
 			var cpu int

 			switch id := args[1].(type) {
--- a/internal/metricRouter/README.md
+++ b/internal/metricRouter/README.md
@@ -6,6 +6,10 @@ The CCMetric router sits in between the collectors and the sinks and can be used

 ```json
 {
+    "num_cache_intervals" : 1,
+    "interval_timestamp" : true,
+    "hostname_tag" : "hostname",
+    "max_forward" : 50,
    "add_tags" : [
        {
            "key" : "cluster",
@@ -25,16 +29,85 @@ The CCMetric router sits in between the collectors and the sinks and can be used
            "if" : "*"
        }
    ],
-    "interval_timestamp" : true
+    "interval_aggregates" : [
+        {
+            "name" : "temp_cores_avg",
+            "if" : "match('temp_core_%d+', metric.Name())",
+            "function" : "avg(values)",
+            "tags" : {
+                "type" : "node"
+            },
+            "meta" : {
+                "group": "IPMI",
+                "unit": "degC",
+                "source": "TempCollector"
+            }
+        }
+    ],
+    "drop_metrics" : [
+        "not_interesting_metric_at_all"
+    ],
+    "drop_metrics_if" : [
+        "match('temp_core_%d+', metric.Name())"
+    ],
+    "rename_metrics" : {
+        "metric_12345" : "mymetric"
+    },
+    "normalize_units" : true,
+    "change_unit_prefix" : {
+      "mem_used" : "G",
+      "mem_total" : "G"
+    }
 }
 ```

 There are three main options `add_tags`, `delete_tags` and `interval_timestamp`. `add_tags` and `delete_tags` are lists consisting of dicts with `key`, `value` and `if`. The `value` can be omitted in the `delete_tags` part as it only uses the `key` for removal. The `interval_timestamp` setting means that a unique timestamp is applied to all metrics traversing the router during an interval.

-# Conditional manipulation of tags
+# Processing order in the router

-The `if` setting allows conditional testing of a single metric like in the example:
+- Add the `hostname_tag` tag (if sent by collectors or cache)
+- If `interval_timestamp == true`, change time of metrics
+- Check if metric should be dropped (`drop_metrics` and `drop_metrics_if`)
+- Add tags from `add_tags`
+- Delete tags from `del_tags`
+- Rename metric based on `rename_metrics` and store old name as `oldname` in meta information
+- Add tags from `add_tags` (if you used the new name in the `if` condition)
+- Delete tags from `del_tags` (if you used the new name in the `if` condition)
+- Send to sinks
+- Move to cache (if `num_cache_intervals > 0`)

+# The `interval_timestamp` option
+
+The collectors' `Read()` functions are not called simultaneously and therefore the metrics gathered in an interval can have different timestamps. If you want to avoid that and have a common timestamp (the beginning of the interval), set this option to `true` and the MetricRouter sets the time.
+
+# The `num_cache_intervals` option
+
+If the MetricRouter should buffer metrics of intervals in a MetricCache, this option specifies the number of past intervals that should be kept. If `num_cache_intervals = 0`, the cache is disabled. With `num_cache_intervals = 1`, only the metrics of the last interval are buffered.
+
+A `num_cache_intervals > 0` is required to use the `interval_aggregates` option.
+
+# The `hostname_tag` option
+
+By default, the router tags metrics with the hostname for all locally created metrics. The default tag name is `hostname`, but it can be changed if your organization wants anything else
+
+# The `max_forward` option
+
+Every time the router receives a metric through any of the channels, it tries to directly read up to `max_forward` metrics from the same channel. This was done as the router thread would go to sleep and wake up with every arriving metric. The default are `50` metrics at once and `max_forward` needs to greater than `1`.
+
+# The `rename_metrics` option
+
+In the ClusterCockpit world we specified a set of standard metrics. Since some collectors determine the metric names based on files, execuables and libraries, they might change from system to system (or installation to installtion, OS to OS, ...). In order to get the common names, you can rename incoming metrics before sending them to the sink. If the metric name matches the `oldname`, it is changed to `newname`
+
+```json
+{
+  "oldname" : "newname",
+  "clock_mhz" : "clock"
+}
+```
+
+# Conditional manipulation of tags (`add_tags` and `del_tags`)
+
+Common config format:
 ```json
 {
    "key" : "test",
@@ -43,8 +116,158 @@ The `if` setting allows conditional testing of a single metric like in the examp
 }
 ```

-If the CCMetric name is equal to 'temp_package_id_0', it adds an additional tag `test=testing` to the metric.
+## The `del_tags` option

-In order to match all metrics, you can use `*`, so in order to add a flag per default, like the `cluster=testcluster` tag in the example.
+The collectors are free to add whatever `key=value` pair to the metric tags (although the usage of tags should be minimized). If you want to delete a tag afterwards, you can do that. When the `if` condition matches on a metric, the `key` is removed from the metric's tags.

+If you want to remove a tag for all metrics, use the condition wildcard `*`. The `value` field can be omitted in the `del_tags` case.

+Never delete tags:
+- `hostname`
+- `type`
+- `type-id`
+
+## The `add_tags` option
+
+In some cases, metrics should be tagged or an existing tag changed based on some condition. This can be done in the `add_tags` section. When the `if` condition evaluates to `true`, the tag `key` is added or gets changed to the new `value`.
+
+If the CCMetric name is equal to `temp_package_id_0`, it adds an additional tag `test=testing` to the metric.
+
+For this metric, a more useful example would be:
+
+```json
+[
+  {
+    "key" : "type",
+    "value" : "socket",
+    "if" : "name == 'temp_package_id_0'"
+  },
+  {
+    "key" : "type-id",
+    "value" : "0",
+    "if" : "name == 'temp_package_id_0'"
+  },
+]
+```
+
+The metric `temp_package_id_0` corresponds to the tempature of the first CPU socket (=package). With the above configuration, the tags would reflect that because commonly the [TempCollector](../../collectors/tempMetric.md) submits only `node` metrics.
+
+In order to match all metrics, you can use `*`, so in order to add a flag per default. This is useful to attached system-specific tags like `cluster=testcluster`:
+
+```json
+{
+    "key" : "cluster",
+    "value" : "testcluster",
+    "if" : "*"
+}
+```
+
+# Dropping metrics
+
+In some cases, you want to drop a metric and don't get it forwarded to the sinks. There are two options based on the required specification:
+- Based only on the metric name -> `drop_metrics` section
+- An evaluable condition with more overhead -> `drop_metrics_if` section
+
+## The `drop_metrics` section
+
+The argument is a list of metric names. No futher checks are performed, only a comparison of the metric name
+
+```json
+{
+  "drop_metrics" : [
+      "drop_metric_1",
+      "drop_metric_2"
+  ]
+}
+```
+
+The example drops all metrics with the name `drop_metric_1` and `drop_metric_2`.
+
+## The `drop_metrics_if` section
+
+This option takes a list of evaluable conditions and performs them one after the other on **all** metrics incoming from the collectors and the metric cache (aka `interval_aggregates`).
+
+```json
+{
+  "drop_metrics_if" : [
+      "match('drop_metric_%d+', name)",
+      "match('cpu', type) && type-id == 0"
+  ]
+}
+```
+The first line is comparable with the example in `drop_metrics`, it drops all metrics starting with `drop_metric_` and ending with a number. The second line drops all metrics of the first hardware thread (**not** recommended)
+
+# Manipulating the metric units
+
+## The `normalize_units` option
+The cc-metric-collector tries to read the data from the system as it is reported. If available, it tries to read the metric unit from the system as well (e.g. from `/proc/meminfo`). The problem is that, depending on the source, the metric units are named differently. Just think about `byte`, `Byte`, `B`, `bytes`, ...
+The [cc-units](https://github.com/ClusterCockpit/cc-units) package provides us a normalization option to use the same metric unit name for all metrics. It this option is set to true, all `unit` meta tags are normalized.
+
+## The `change_unit_prefix` section
+It is often the case that metrics are reported by the system using a rather outdated unit prefix (like `/proc/meminfo` still uses kByte despite current memory sizes are in the GByte range). If you want to change the prefix of a unit, you can do that with the help of [cc-units](https://github.com/ClusterCockpit/cc-units). The setting works on the metric name and requires the new prefix for the metric. The cc-units package determines the scaling factor.
+
+# Aggregate metric values of the current interval with the `interval_aggregates` option
+
+**Note:** `interval_aggregates` works only if `num_cache_intervals` > 0
+
+In some cases, you need to derive new metrics based on the metrics arriving during an interval. This can be done in the `interval_aggregates` section. The logic is similar to the other metric manipulation and filtering options. A cache stores all metrics that arrive during an interval. At the beginning of the *next* interval, the list of metrics is submitted to the MetricAggregator. It derives new metrics and submits them back to the MetricRouter, so they are sent in the next interval but have the timestamp of the previous interval beginning.
+
+```json
+"interval_aggregates" : [
+  {
+    "name" : "new_metric_name",
+    "if" : "match('sub_metric_%d+', metric.Name())",
+    "function" : "avg(values)",
+    "tags" : {
+      "key" : "value",
+      "type" : "node"
+    },
+    "meta" : {
+      "key" : "value",
+      "group": "IPMI",
+      "unit": "<copy>",
+    }
+  }
+]
+```
+
+The above configuration, collects all metric values for metrics evaluating `if` to `true`. Afterwards it calculates the average `avg` of the `values` (list of all metrics' field `value`) and creates a new CCMetric with the name `new_metric_name` and adds the tags in `tags` and the meta information in `meta`. The special value `<copy>` searches the input metrics and copies the value of the first match of `key` to the new CCMetric.
+
+If you are not interested in the input metrics `sub_metric_%d+` at all, you can add the same condition used here to the `drop_metrics_if` section to drop them.
+
+Use cases for `interval_aggregates`:
+- Combine multiple metrics of the a collector to a new one like the [MemstatCollector](../../collectors/memstatMetric.md) does it for `mem_used`)):
+```json
+  {
+    "name" : "mem_used",
+    "if" : "source == 'MemstatCollector'",
+    "function" : "sum(mem_total) - (sum(mem_free) + sum(mem_buffers) + sum(mem_cached))",
+    "tags" : {
+      "type" : "node"
+    },
+    "meta" : {
+      "group": "<copy>",
+      "unit": "<copy>",
+      "source": "<copy>"
+    }
+  }
+```
+
+# Order of operations
+
+The router performs the above mentioned options in a specific order. In order to get the logic you want for a specific metric, it is crucial to know the processing order:
+
+- Add the `hostname` tag (c)
+- Manipulate the timestamp to the interval timestamp (c,r)
+- Drop metrics based on `drop_metrics` and `drop_metrics_if` (c,r)
+- Add tags based on `add_tags` (c,r)
+- Delete tags based on `del_tags` (c,r)
+- Rename metric based on `rename_metric` (c,r)
+  - Add tags based on `add_tags` to still work if the configuration uses the new name (c,r) 
+  - Delete tags based on `del_tags` to still work if the configuration uses the new name (c,r)
+- Normalize units when `normalize_units` is set (c,r)
+- Convert unit prefix based on `change_unit_prefix` (c,r)
+
+Legend:
+- 'c' if metric is coming from a collector
+- 'r' if metric is coming from a receiver
--- a/internal/metricRouter/metricCache.go
+++ b/internal/metricRouter/metricCache.go
@@ -4,10 +4,11 @@ import (
 	"sync"
 	"time"

-	cclog "github.com/ClusterCockpit/cc-metric-collector/internal/ccLogger"
+	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"

-	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
-	mct "github.com/ClusterCockpit/cc-metric-collector/internal/multiChanTicker"
+	agg "github.com/ClusterCockpit/cc-metric-collector/internal/metricAggregator"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
+	mct "github.com/ClusterCockpit/cc-metric-collector/pkg/multiChanTicker"
 )

 type metricCachePeriod struct {
@@ -22,13 +23,14 @@ type metricCachePeriod struct {
 type metricCache struct {
 	numPeriods int
 	curPeriod  int
+	lock       sync.Mutex
 	intervals  []*metricCachePeriod
 	wg         *sync.WaitGroup
 	ticker     mct.MultiChanTicker
 	tickchan   chan time.Time
 	done       chan bool
 	output     chan lp.CCMetric
-	aggEngine  MetricAggregator
+	aggEngine  agg.MetricAggregator
 }

 type MetricCache interface {
@@ -59,7 +61,7 @@ func (c *metricCache) Init(output chan lp.CCMetric, ticker mct.MultiChanTicker,

 	// Create a new aggregation engine. No separate goroutine at the moment
 	// The code is executed by the MetricCache goroutine
-	c.aggEngine, err = NewAggregator(c.output)
+	c.aggEngine, err = agg.NewAggregator(c.output)
 	if err != nil {
 		cclog.ComponentError("MetricCache", "Cannot create aggregator")
 		return err
@@ -102,9 +104,11 @@ func (c *metricCache) Start() {
 				done()
 				return
 			case tick := <-c.tickchan:
+				c.lock.Lock()
 				old := rotate(tick)
 				// Get the last period and evaluate aggregation metrics
 				starttime, endtime, metrics := c.GetPeriod(old)
+				c.lock.Unlock()
 				if len(metrics) > 0 {
 					c.aggEngine.Eval(starttime, endtime, metrics)
 				} else {
@@ -122,6 +126,7 @@ func (c *metricCache) Start() {
 // to avoid reallocations
 func (c *metricCache) Add(metric lp.CCMetric) {
 	if c.curPeriod >= 0 && c.curPeriod < c.numPeriods {
+		c.lock.Lock()
 		p := c.intervals[c.curPeriod]
 		if p.numMetrics < p.sizeMetrics {
 			p.metrics[p.numMetrics] = metric
@@ -133,6 +138,7 @@ func (c *metricCache) Add(metric lp.CCMetric) {
 			p.sizeMetrics = p.sizeMetrics + 1
 			p.stopstamp = metric.Time()
 		}
+		c.lock.Unlock()
 	}
 }

@@ -148,16 +154,26 @@ func (c *metricCache) DeleteAggregation(name string) error {
 // is the current one, index=1 the last interval and so on. Returns and empty array if a wrong index
 // is given (negative index, index larger than configured number of total intervals, ...)
 func (c *metricCache) GetPeriod(index int) (time.Time, time.Time, []lp.CCMetric) {
+	var start time.Time = time.Now()
+	var stop time.Time = time.Now()
+	var metrics []lp.CCMetric
 	if index >= 0 && index < c.numPeriods {
 		pindex := c.curPeriod - index
 		if pindex < 0 {
 			pindex = c.numPeriods - pindex
 		}
 		if pindex >= 0 && pindex < c.numPeriods {
-			return c.intervals[pindex].startstamp, c.intervals[pindex].stopstamp, c.intervals[pindex].metrics
+			start = c.intervals[pindex].startstamp
+			stop = c.intervals[pindex].stopstamp
+			metrics = c.intervals[pindex].metrics
+			//return c.intervals[pindex].startstamp, c.intervals[pindex].stopstamp, c.intervals[pindex].metrics
+		} else {
+			metrics = make([]lp.CCMetric, 0)
 		}
+	} else {
+		metrics = make([]lp.CCMetric, 0)
 	}
-	return time.Now(), time.Now(), make([]lp.CCMetric, 0)
+	return start, stop, metrics
 }

 // Close finishes / stops the metric cache
--- a/internal/metricRouter/metricRouter.go
+++ b/internal/metricRouter/metricRouter.go
@@ -7,13 +7,16 @@ import (
 	"sync"
 	"time"

-	cclog "github.com/ClusterCockpit/cc-metric-collector/internal/ccLogger"
+	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"

-	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
-	mct "github.com/ClusterCockpit/cc-metric-collector/internal/multiChanTicker"
-	"gopkg.in/Knetic/govaluate.v2"
+	agg "github.com/ClusterCockpit/cc-metric-collector/internal/metricAggregator"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
+	mct "github.com/ClusterCockpit/cc-metric-collector/pkg/multiChanTicker"
+	units "github.com/ClusterCockpit/cc-units"
 )

+const ROUTER_MAX_FORWARD = 50
+
 // Metric router tag configuration
 type metricRouterTagConfig struct {
 	Key       string `json:"key"`   // Tag name
@@ -23,11 +26,19 @@ type metricRouterTagConfig struct {

 // Metric router configuration
 type metricRouterConfig struct {
-	AddTags           []metricRouterTagConfig          `json:"add_tags"`            // List of tags that are added when the condition is met
-	DelTags           []metricRouterTagConfig          `json:"delete_tags"`         // List of tags that are removed when the condition is met
-	IntervalAgg       []metricAggregatorIntervalConfig `json:"interval_aggregates"` // List of aggregation function processed at the end of an interval
-	IntervalStamp     bool                             `json:"interval_timestamp"`  // Update timestamp periodically by ticker each interval?
-	NumCacheIntervals int                              `json:"num_cache_intervals"` // Number of intervals of cached metrics for evaluation
+	HostnameTagName   string                               `json:"hostname_tag"`        // Key name used when adding the hostname to a metric (default 'hostname')
+	AddTags           []metricRouterTagConfig              `json:"add_tags"`            // List of tags that are added when the condition is met
+	DelTags           []metricRouterTagConfig              `json:"delete_tags"`         // List of tags that are removed when the condition is met
+	IntervalAgg       []agg.MetricAggregatorIntervalConfig `json:"interval_aggregates"` // List of aggregation function processed at the end of an interval
+	DropMetrics       []string                             `json:"drop_metrics"`        // List of metric names to drop. For fine-grained dropping use drop_metrics_if
+	DropMetricsIf     []string                             `json:"drop_metrics_if"`     // List of evaluatable terms to drop metrics
+	RenameMetrics     map[string]string                    `json:"rename_metrics"`      // Map to rename metric name from key to value
+	IntervalStamp     bool                                 `json:"interval_timestamp"`  // Update timestamp periodically by ticker each interval?
+	NumCacheIntervals int                                  `json:"num_cache_intervals"` // Number of intervals of cached metrics for evaluation
+	MaxForward        int                                  `json:"max_forward"`         // Number of maximal forwarded metrics at one select
+	NormalizeUnits    bool                                 `json:"normalize_units"`     // Check unit meta flag and normalize it using cc-units
+	ChangeUnitPrefix  map[string]string                    `json:"change_unit_prefix"`  // Add prefix that should be applied to the metrics
+	dropMetrics       map[string]bool                      // Internal map for O(1) lookup
 }

 // Metric router data structure
@@ -40,11 +51,11 @@ type metricRouter struct {
 	done        chan bool           // channel to finish / stop metric router
 	wg          *sync.WaitGroup     // wait group for all goroutines in cc-metric-collector
 	timestamp   time.Time           // timestamp periodically updated by ticker each interval
-	timerdone   chan bool           // channel to finish / stop timestamp updater
 	ticker      mct.MultiChanTicker // periodically ticking once each interval
 	config      metricRouterConfig  // json encoded config for metric router
 	cache       MetricCache         // pointer to MetricCache
 	cachewg     sync.WaitGroup      // wait group for MetricCache
+	maxForward  int                 // number of metrics to forward maximally in one iteration
 }

 // MetricRouter access functions
@@ -69,6 +80,8 @@ func (r *metricRouter) Init(ticker mct.MultiChanTicker, wg *sync.WaitGroup, rout
 	r.cache_input = make(chan lp.CCMetric)
 	r.wg = wg
 	r.ticker = ticker
+	r.config.MaxForward = ROUTER_MAX_FORWARD
+	r.config.HostnameTagName = "hostname"

 	// Set hostname
 	hostname, err := os.Hostname()
@@ -92,85 +105,55 @@ func (r *metricRouter) Init(ticker mct.MultiChanTicker, wg *sync.WaitGroup, rout
 		cclog.ComponentError("MetricRouter", err.Error())
 		return err
 	}
-	numIntervals := r.config.NumCacheIntervals
-	if numIntervals <= 0 {
-		numIntervals = 1
+	r.maxForward = 1
+	if r.config.MaxForward > r.maxForward {
+		r.maxForward = r.config.MaxForward
 	}
-	r.cache, err = NewCache(r.cache_input, r.ticker, &r.cachewg, numIntervals)
-	if err != nil {
-		cclog.ComponentError("MetricRouter", "MetricCache initialization failed:", err.Error())
-		return err
+	if r.config.NumCacheIntervals > 0 {
+		r.cache, err = NewCache(r.cache_input, r.ticker, &r.cachewg, r.config.NumCacheIntervals)
+		if err != nil {
+			cclog.ComponentError("MetricRouter", "MetricCache initialization failed:", err.Error())
+			return err
+		}
+		for _, agg := range r.config.IntervalAgg {
+			r.cache.AddAggregation(agg.Name, agg.Function, agg.Condition, agg.Tags, agg.Meta)
+		}
 	}
-	for _, agg := range r.config.IntervalAgg {
-		r.cache.AddAggregation(agg.Name, agg.Function, agg.Condition, agg.Tags, agg.Meta)
+	r.config.dropMetrics = make(map[string]bool)
+	for _, mname := range r.config.DropMetrics {
+		r.config.dropMetrics[mname] = true
 	}
 	return nil
 }

-// StartTimer starts a timer which updates timestamp periodically
-func (r *metricRouter) StartTimer() {
-	m := make(chan time.Time)
-	r.ticker.AddChannel(m)
-	r.timerdone = make(chan bool)
-
-	r.wg.Add(1)
-	go func() {
-		defer r.wg.Done()
-		for {
-			select {
-			case <-r.timerdone:
-				close(r.timerdone)
-				cclog.ComponentDebug("MetricRouter", "TIMER DONE")
-				return
-			case t := <-m:
-				r.timestamp = t
-			}
-		}
-	}()
-	cclog.ComponentDebug("MetricRouter", "TIMER START")
-}
-
-// EvalCondition evaluates condition cond for metric data from point
-func (r *metricRouter) EvalCondition(cond string, point lp.CCMetric) (bool, error) {
-	expression, err := govaluate.NewEvaluableExpression(cond)
-	if err != nil {
-		cclog.ComponentDebug("MetricRouter", cond, " = ", err.Error())
-		return false, err
-	}
-
-	// Add metric name, tags, meta data, fields and timestamp to the parameter list
+func getParamMap(point lp.CCMetric) map[string]interface{} {
 	params := make(map[string]interface{})
+	params["metric"] = point
 	params["name"] = point.Name()
-	for _, t := range point.TagList() {
-		params[t.Key] = t.Value
+	for key, value := range point.Tags() {
+		params[key] = value
 	}
-	for _, m := range point.MetaList() {
-		params[m.Key] = m.Value
+	for key, value := range point.Meta() {
+		params[key] = value
 	}
-	for _, f := range point.FieldList() {
-		params[f.Key] = f.Value
+	for key, value := range point.Fields() {
+		params[key] = value
 	}
 	params["timestamp"] = point.Time()
-
-	// evaluate condition
-	result, err := expression.Evaluate(params)
-	if err != nil {
-		cclog.ComponentDebug("MetricRouter", cond, " = ", err.Error())
-		return false, err
-	}
-	return bool(result.(bool)), err
+	return params
 }

 // DoAddTags adds a tag when condition is fullfiled
 func (r *metricRouter) DoAddTags(point lp.CCMetric) {
+	var conditionMatches bool
 	for _, m := range r.config.AddTags {
-		var conditionMatches bool
-
 		if m.Condition == "*" {
+			// Condition is always matched
 			conditionMatches = true
 		} else {
+			// Evaluate condition
 			var err error
-			conditionMatches, err = r.EvalCondition(m.Condition, point)
+			conditionMatches, err = agg.EvalBoolCondition(m.Condition, getParamMap(point))
 			if err != nil {
 				cclog.ComponentError("MetricRouter", err.Error())
 				conditionMatches = false
@@ -184,14 +167,15 @@ func (r *metricRouter) DoAddTags(point lp.CCMetric) {

 // DoDelTags removes a tag when condition is fullfiled
 func (r *metricRouter) DoDelTags(point lp.CCMetric) {
+	var conditionMatches bool
 	for _, m := range r.config.DelTags {
-		var conditionMatches bool
-
 		if m.Condition == "*" {
+			// Condition is always matched
 			conditionMatches = true
 		} else {
+			// Evaluate condition
 			var err error
-			conditionMatches, err = r.EvalCondition(m.Condition, point)
+			conditionMatches, err = agg.EvalBoolCondition(m.Condition, getParamMap(point))
 			if err != nil {
 				cclog.ComponentError("MetricRouter", err.Error())
 				conditionMatches = false
@@ -203,13 +187,68 @@ func (r *metricRouter) DoDelTags(point lp.CCMetric) {
 	}
 }

+// Conditional test whether a metric should be dropped
+func (r *metricRouter) dropMetric(point lp.CCMetric) bool {
+	// Simple drop check
+	if conditionMatches, ok := r.config.dropMetrics[point.Name()]; ok {
+		return conditionMatches
+	}
+
+	// Checking the dropping conditions
+	for _, m := range r.config.DropMetricsIf {
+		conditionMatches, err := agg.EvalBoolCondition(m, getParamMap(point))
+		if err != nil {
+			cclog.ComponentError("MetricRouter", err.Error())
+			conditionMatches = false
+		}
+		if conditionMatches {
+			return conditionMatches
+		}
+	}
+
+	// No dropping condition met
+	return false
+}
+
+func (r *metricRouter) prepareUnit(point lp.CCMetric) bool {
+	if r.config.NormalizeUnits {
+		if in_unit, ok := point.GetMeta("unit"); ok {
+			u := units.NewUnit(in_unit)
+			if u.Valid() {
+				point.AddMeta("unit", u.Short())
+			}
+		}
+	}
+	if newP, ok := r.config.ChangeUnitPrefix[point.Name()]; ok {
+
+		newPrefix := units.NewPrefix(newP)
+
+		if in_unit, ok := point.GetMeta("unit"); ok && newPrefix != units.InvalidPrefix {
+			u := units.NewUnit(in_unit)
+			if u.Valid() {
+				cclog.ComponentDebug("MetricRouter", "Change prefix to", newP, "for metric", point.Name())
+				conv, out_unit := units.GetUnitPrefixFactor(u, newPrefix)
+				if conv != nil && out_unit.Valid() {
+					if val, ok := point.GetField("value"); ok {
+						point.AddField("value", conv(val))
+						point.AddMeta("unit", out_unit.Short())
+					}
+				}
+			}
+
+		}
+	}
+
+	return true
+}
+
 // Start starts the metric router
 func (r *metricRouter) Start() {
-
 	// start timer if configured
 	r.timestamp = time.Now()
+	timeChan := make(chan time.Time)
 	if r.config.IntervalStamp {
-		r.StartTimer()
+		r.ticker.AddChannel(timeChan)
 	}

 	// Router manager is done
@@ -224,43 +263,94 @@ func (r *metricRouter) Start() {
 		cclog.ComponentDebug("MetricRouter", "FORWARD", point)
 		r.DoAddTags(point)
 		r.DoDelTags(point)
+		name := point.Name()
+		if new, ok := r.config.RenameMetrics[name]; ok {
+			point.SetName(new)
+			point.AddMeta("oldname", name)
+			r.DoAddTags(point)
+			r.DoDelTags(point)
+		}
+
+		r.prepareUnit(point)
+
 		for _, o := range r.outputs {
 			o <- point
 		}
 	}

+	// Foward message received from collector channel
+	coll_forward := func(p lp.CCMetric) {
+		// receive from metric collector
+		p.AddTag(r.config.HostnameTagName, r.hostname)
+		if r.config.IntervalStamp {
+			p.SetTime(r.timestamp)
+		}
+		if !r.dropMetric(p) {
+			forward(p)
+		}
+		// even if the metric is dropped, it is stored in the cache for
+		// aggregations
+		if r.config.NumCacheIntervals > 0 {
+			r.cache.Add(p)
+		}
+	}
+
+	// Forward message received from receivers channel
+	recv_forward := func(p lp.CCMetric) {
+		// receive from receive manager
+		if r.config.IntervalStamp {
+			p.SetTime(r.timestamp)
+		}
+		if !r.dropMetric(p) {
+			forward(p)
+		}
+	}
+
+	// Forward message received from cache channel
+	cache_forward := func(p lp.CCMetric) {
+		// receive from metric collector
+		if !r.dropMetric(p) {
+			p.AddTag(r.config.HostnameTagName, r.hostname)
+			forward(p)
+		}
+	}
+
 	// Start Metric Cache
-	r.cache.Start()
+	if r.config.NumCacheIntervals > 0 {
+		r.cache.Start()
+	}

 	r.wg.Add(1)
 	go func() {
 		defer r.wg.Done()
+
 		for {
 			select {
 			case <-r.done:
 				done()
 				return

+			case timestamp := <-timeChan:
+				r.timestamp = timestamp
+				cclog.ComponentDebug("MetricRouter", "Update timestamp", r.timestamp.UnixNano())
+
 			case p := <-r.coll_input:
-				// receive from metric collector
-				p.AddTag("hostname", r.hostname)
-				if r.config.IntervalStamp {
-					p.SetTime(r.timestamp)
+				coll_forward(p)
+				for i := 0; len(r.coll_input) > 0 && i < (r.maxForward-1); i++ {
+					coll_forward(<-r.coll_input)
 				}
-				forward(p)
-				r.cache.Add(p)

 			case p := <-r.recv_input:
-				// receive from receive manager
-				if r.config.IntervalStamp {
-					p.SetTime(r.timestamp)
+				recv_forward(p)
+				for i := 0; len(r.recv_input) > 0 && i < (r.maxForward-1); i++ {
+					recv_forward(<-r.recv_input)
 				}
-				forward(p)

 			case p := <-r.cache_input:
-				// receive from metric collector
-				p.AddTag("hostname", r.hostname)
-				forward(p)
+				cache_forward(p)
+				for i := 0; len(r.cache_input) > 0 && i < (r.maxForward-1); i++ {
+					cache_forward(<-r.cache_input)
+				}
 			}
 		}
 	}()
@@ -288,14 +378,13 @@ func (r *metricRouter) Close() {
 	r.done <- true
 	// wait for close of channel r.done
 	<-r.done
-	if r.config.IntervalStamp {
-		cclog.ComponentDebug("MetricRouter", "TIMER CLOSE")
-		r.timerdone <- true
-		// wait for close of channel r.timerdone
-		<-r.timerdone
+
+	// stop metric cache
+	if r.config.NumCacheIntervals > 0 {
+		cclog.ComponentDebug("MetricRouter", "CACHE CLOSE")
+		r.cache.Close()
+		r.cachewg.Wait()
 	}
-	r.cache.Close()
-	r.cachewg.Wait()
 }

 // New creates a new initialized metric router
--- a/internal/ccLogger/cclogger.go
+++ b/internal/ccLogger/cclogger.go
--- a/pkg/ccMetric/README.md
+++ b/pkg/ccMetric/README.md
@@ -0,0 +1,57 @@
+# ClusterCockpit metrics
+
+As described in the [ClusterCockpit specifications](https://github.com/ClusterCockpit/cc-specifications), the whole ClusterCockpit stack uses metrics in the InfluxDB line protocol format. This is also the input and output format for the ClusterCockpit Metric Collector but internally it uses an extended format while processing, named CCMetric.
+
+It is basically a copy of the [InfluxDB line protocol](https://github.com/influxdata/line-protocol) `MutableMetric` interface with one extension. Besides the tags and fields, it contains a list of meta information (re-using the `Tag` structure of the original protocol):
+
+```golang
+type ccMetric struct {
+    name   string                 // Measurement name
+    meta   map[string]string      // map of meta data tags
+    tags   map[string]string      // map of of tags
+    fields map[string]interface{} // map of of fields
+    tm     time.Time              // timestamp
+}
+
+type CCMetric interface {
+    ToPoint(metaAsTags map[string]bool) *write.Point  // Generate influxDB point for data type ccMetric
+    ToLineProtocol(metaAsTags map[string]bool) string // Generate influxDB line protocol for data type ccMetric
+    String() string                                   // Return line-protocol like string
+
+    Name() string        // Get metric name
+    SetName(name string) // Set metric name
+
+    Time() time.Time     // Get timestamp
+    SetTime(t time.Time) // Set timestamp
+
+    Tags() map[string]string                   // Map of tags
+    AddTag(key, value string)                  // Add a tag
+    GetTag(key string) (value string, ok bool) // Get a tag by its key
+    HasTag(key string) (ok bool)               // Check if a tag key is present
+    RemoveTag(key string)                      // Remove a tag by its key
+
+    Meta() map[string]string                    // Map of meta data tags
+    AddMeta(key, value string)                  // Add a meta data tag
+    GetMeta(key string) (value string, ok bool) // Get a meta data tab addressed by its key
+    HasMeta(key string) (ok bool)               // Check if a meta data key is present
+    RemoveMeta(key string)                      // Remove a meta data tag by its key
+
+    Fields() map[string]interface{}                   // Map of fields
+    AddField(key string, value interface{})           // Add a field
+    GetField(key string) (value interface{}, ok bool) // Get a field addressed by its key
+    HasField(key string) (ok bool)                    // Check if a field key is present
+    RemoveField(key string)                           // Remove a field addressed by its key
+}
+
+func New(name string, tags map[string]string, meta map[string]string, fields map[string]interface{}, tm time.Time) (CCMetric, error)
+func FromMetric(other CCMetric) CCMetric
+func FromInfluxMetric(other lp.Metric) CCMetric
+```
+
+The `CCMetric` interface provides the same functions as the `MutableMetric` like `{Add, Get, Remove, Has}{Tag, Field}` and additionally provides `{Add, Get, Remove, Has}Meta`.
+
+The InfluxDB protocol creates a new metric with `influx.New(name, tags, fields, time)` while CCMetric uses `ccMetric.New(name, tags, meta, fields, time)` where `tags` and `meta` are both of type `map[string]string`.
+
+You can copy a CCMetric with `FromMetric(other CCMetric) CCMetric`. If you get an `influx.Metric` from a function, like the line protocol parser, you can use `FromInfluxMetric(other influx.Metric) CCMetric` to get a CCMetric out of it (see `NatsReceiver` for an example).
+
+Although the [cc-specifications](https://github.com/ClusterCockpit/cc-specifications/blob/master/interfaces/lineprotocol/README.md) defines that there is only a `value` field for the metric value, the CCMetric still can have multiple values similar to the InfluxDB line protocol.
--- a/pkg/ccMetric/ccMetric.go
+++ b/pkg/ccMetric/ccMetric.go
@@ -0,0 +1,353 @@
+package ccmetric
+
+import (
+	"fmt"
+	"time"
+
+	influxdb2 "github.com/influxdata/influxdb-client-go/v2"
+	write "github.com/influxdata/influxdb-client-go/v2/api/write"
+	lp "github.com/influxdata/line-protocol" // MIT license
+	"golang.org/x/exp/maps"
+)
+
+// Most functions are derived from github.com/influxdata/line-protocol/metric.go
+// The metric type is extended with an extra meta information list re-using the Tag
+// type.
+//
+// See: https://docs.influxdata.com/influxdb/latest/reference/syntax/line-protocol/
+type ccMetric struct {
+	name   string                 // Measurement name
+	meta   map[string]string      // map of meta data tags
+	tags   map[string]string      // map of of tags
+	fields map[string]interface{} // map of of fields
+	tm     time.Time              // timestamp
+}
+
+// ccMetric access functions
+type CCMetric interface {
+	ToPoint(metaAsTags map[string]bool) *write.Point  // Generate influxDB point for data type ccMetric
+	ToLineProtocol(metaAsTags map[string]bool) string // Generate influxDB line protocol for data type ccMetric
+
+	Name() string        // Get metric name
+	SetName(name string) // Set metric name
+
+	Time() time.Time     // Get timestamp
+	SetTime(t time.Time) // Set timestamp
+
+	Tags() map[string]string                   // Map of tags
+	AddTag(key, value string)                  // Add a tag
+	GetTag(key string) (value string, ok bool) // Get a tag by its key
+	HasTag(key string) (ok bool)               // Check if a tag key is present
+	RemoveTag(key string)                      // Remove a tag by its key
+
+	Meta() map[string]string                    // Map of meta data tags
+	AddMeta(key, value string)                  // Add a meta data tag
+	GetMeta(key string) (value string, ok bool) // Get a meta data tab addressed by its key
+	HasMeta(key string) (ok bool)               // Check if a meta data key is present
+	RemoveMeta(key string)                      // Remove a meta data tag by its key
+
+	Fields() map[string]interface{}                   // Map of fields
+	AddField(key string, value interface{})           // Add a field
+	GetField(key string) (value interface{}, ok bool) // Get a field addressed by its key
+	HasField(key string) (ok bool)                    // Check if a field key is present
+	RemoveField(key string)                           // Remove a field addressed by its key
+	String() string                                   // Return line-protocol like string
+}
+
+// String implements the stringer interface for data type ccMetric
+func (m *ccMetric) String() string {
+	return fmt.Sprintf(
+		"Name: %s, Tags: %+v, Meta: %+v, fields: %+v, Timestamp: %d",
+		m.name, m.tags, m.meta, m.fields, m.tm.UnixNano(),
+	)
+}
+
+// ToLineProtocol generates influxDB line protocol for data type ccMetric
+func (m *ccMetric) ToPoint(metaAsTags map[string]bool) (p *write.Point) {
+	p = influxdb2.NewPoint(m.name, m.tags, m.fields, m.tm)
+	for key, use_as_tag := range metaAsTags {
+		if use_as_tag {
+			if value, ok := m.GetMeta(key); ok {
+				p.AddTag(key, value)
+			}
+		}
+	}
+	return p
+}
+
+// ToLineProtocol generates influxDB line protocol for data type ccMetric
+func (m *ccMetric) ToLineProtocol(metaAsTags map[string]bool) string {
+
+	return write.PointToLineProtocol(
+		m.ToPoint(metaAsTags),
+		time.Nanosecond,
+	)
+}
+
+// Name returns the measurement name
+func (m *ccMetric) Name() string {
+	return m.name
+}
+
+// SetName sets the measurement name
+func (m *ccMetric) SetName(name string) {
+	m.name = name
+}
+
+// Time returns timestamp
+func (m *ccMetric) Time() time.Time {
+	return m.tm
+}
+
+// SetTime sets the timestamp
+func (m *ccMetric) SetTime(t time.Time) {
+	m.tm = t
+}
+
+// Tags returns the the list of tags as key-value-mapping
+func (m *ccMetric) Tags() map[string]string {
+	return m.tags
+}
+
+// AddTag adds a tag (consisting of key and value) to the map of tags
+func (m *ccMetric) AddTag(key, value string) {
+	m.tags[key] = value
+}
+
+// GetTag returns the tag with tag's key equal to <key>
+func (m *ccMetric) GetTag(key string) (string, bool) {
+	value, ok := m.tags[key]
+	return value, ok
+}
+
+// HasTag checks if a tag with key equal to <key> is present in the list of tags
+func (m *ccMetric) HasTag(key string) bool {
+	_, ok := m.tags[key]
+	return ok
+}
+
+// RemoveTag removes the tag with tag's key equal to <key>
+func (m *ccMetric) RemoveTag(key string) {
+	delete(m.tags, key)
+}
+
+// Meta returns the meta data tags as key-value mapping
+func (m *ccMetric) Meta() map[string]string {
+	return m.meta
+}
+
+// AddMeta adds a meta data tag (consisting of key and value) to the map of meta data tags
+func (m *ccMetric) AddMeta(key, value string) {
+	m.meta[key] = value
+}
+
+// GetMeta returns the meta data tag with meta data's key equal to <key>
+func (m *ccMetric) GetMeta(key string) (string, bool) {
+	value, ok := m.meta[key]
+	return value, ok
+}
+
+// HasMeta checks if a meta data tag with meta data's key equal to <key> is present in the map of meta data tags
+func (m *ccMetric) HasMeta(key string) bool {
+	_, ok := m.meta[key]
+	return ok
+}
+
+// RemoveMeta removes the meta data tag with tag's key equal to <key>
+func (m *ccMetric) RemoveMeta(key string) {
+	delete(m.meta, key)
+}
+
+// Fields returns the list of fields as key-value-mapping
+func (m *ccMetric) Fields() map[string]interface{} {
+	return m.fields
+}
+
+// AddField adds a field (consisting of key and value) to the map of fields
+func (m *ccMetric) AddField(key string, value interface{}) {
+	m.fields[key] = value
+}
+
+// GetField returns the field with field's key equal to <key>
+func (m *ccMetric) GetField(key string) (interface{}, bool) {
+	v, ok := m.fields[key]
+	return v, ok
+}
+
+// HasField checks if a field with field's key equal to <key> is present in the map of fields
+func (m *ccMetric) HasField(key string) bool {
+	_, ok := m.fields[key]
+	return ok
+}
+
+// RemoveField removes the field with field's key equal to <key>
+// from the map of fields
+func (m *ccMetric) RemoveField(key string) {
+	delete(m.fields, key)
+}
+
+// New creates a new measurement point
+func New(
+	name string,
+	tags map[string]string,
+	meta map[string]string,
+	fields map[string]interface{},
+	tm time.Time,
+) (CCMetric, error) {
+	m := &ccMetric{
+		name:   name,
+		tags:   maps.Clone(tags),
+		meta:   maps.Clone(meta),
+		fields: make(map[string]interface{}, len(fields)),
+		tm:     tm,
+	}
+
+	// deep copy fields
+	for k, v := range fields {
+		v := convertField(v)
+		if v == nil {
+			continue
+		}
+		m.fields[k] = v
+	}
+
+	return m, nil
+}
+
+// FromMetric copies the metric <other>
+func FromMetric(other CCMetric) CCMetric {
+
+	return &ccMetric{
+		name:   other.Name(),
+		tags:   maps.Clone(other.Tags()),
+		meta:   maps.Clone(other.Meta()),
+		fields: maps.Clone(other.Fields()),
+		tm:     other.Time(),
+	}
+}
+
+// FromInfluxMetric copies the influxDB line protocol metric <other>
+func FromInfluxMetric(other lp.Metric) CCMetric {
+	m := &ccMetric{
+		name:   other.Name(),
+		tags:   make(map[string]string),
+		meta:   make(map[string]string),
+		fields: make(map[string]interface{}),
+		tm:     other.Time(),
+	}
+
+	// deep copy tags and fields
+	for _, otherTag := range other.TagList() {
+		m.tags[otherTag.Key] = otherTag.Value
+	}
+	for _, otherField := range other.FieldList() {
+		m.fields[otherField.Key] = otherField.Value
+	}
+	return m
+}
+
+// convertField converts data types of fields by the following schemata:
+//
+//	                       *float32, *float64,                      float32, float64 -> float64
+//	*int,  *int8,  *int16,   *int32,   *int64,  int,  int8,  int16,   int32,   int64 ->   int64
+//
+// *uint, *uint8, *uint16,  *uint32,  *uint64, uint, uint8, uint16,  uint32,  uint64 ->  uint64
+// *[]byte, *string,                           []byte, string                        -> string
+// *bool,                                      bool                                  -> bool
+func convertField(v interface{}) interface{} {
+	switch v := v.(type) {
+	case float64:
+		return v
+	case int64:
+		return v
+	case string:
+		return v
+	case bool:
+		return v
+	case int:
+		return int64(v)
+	case uint:
+		return uint64(v)
+	case uint64:
+		return uint64(v)
+	case []byte:
+		return string(v)
+	case int32:
+		return int64(v)
+	case int16:
+		return int64(v)
+	case int8:
+		return int64(v)
+	case uint32:
+		return uint64(v)
+	case uint16:
+		return uint64(v)
+	case uint8:
+		return uint64(v)
+	case float32:
+		return float64(v)
+	case *float64:
+		if v != nil {
+			return *v
+		}
+	case *int64:
+		if v != nil {
+			return *v
+		}
+	case *string:
+		if v != nil {
+			return *v
+		}
+	case *bool:
+		if v != nil {
+			return *v
+		}
+	case *int:
+		if v != nil {
+			return int64(*v)
+		}
+	case *uint:
+		if v != nil {
+			return uint64(*v)
+		}
+	case *uint64:
+		if v != nil {
+			return uint64(*v)
+		}
+	case *[]byte:
+		if v != nil {
+			return string(*v)
+		}
+	case *int32:
+		if v != nil {
+			return int64(*v)
+		}
+	case *int16:
+		if v != nil {
+			return int64(*v)
+		}
+	case *int8:
+		if v != nil {
+			return int64(*v)
+		}
+	case *uint32:
+		if v != nil {
+			return uint64(*v)
+		}
+	case *uint16:
+		if v != nil {
+			return uint64(*v)
+		}
+	case *uint8:
+		if v != nil {
+			return uint64(*v)
+		}
+	case *float32:
+		if v != nil {
+			return float64(*v)
+		}
+	default:
+		return nil
+	}
+	return nil
+}
--- a/pkg/ccTopology/ccTopology.go
+++ b/pkg/ccTopology/ccTopology.go
@@ -0,0 +1,425 @@
+package ccTopology
+
+import (
+	"fmt"
+	"log"
+	"os"
+	"path/filepath"
+	"regexp"
+	"strconv"
+	"strings"
+
+	cclogger "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
+	"golang.org/x/exp/slices"
+)
+
+const SYSFS_CPUBASE = `/sys/devices/system/cpu`
+
+// Structure holding all information about a hardware thread
+// See https://www.kernel.org/doc/Documentation/ABI/stable/sysfs-devices-system-cpu
+type HwthreadEntry struct {
+	// for each CPUx:
+	CpuID        int   // CPU / hardware thread ID
+	SMT          int   // Simultaneous Multithreading ID
+	CoreCPUsList []int // CPUs within the same core
+	Core         int   // Socket local core ID
+	Socket       int   // Sockets (physical) ID
+	Die          int   // Die ID
+	NumaDomain   int   // NUMA Domain
+}
+
+var cache struct {
+	HwthreadList   []int // List of CPU hardware threads
+	SMTList        []int // List of symmetric hyper threading IDs
+	CoreList       []int // List of CPU core IDs
+	SocketList     []int // List of CPU sockets (physical) IDs
+	DieList        []int // List of CPU Die IDs
+	NumaDomainList []int // List of NUMA Domains
+
+	CpuData []HwthreadEntry
+}
+
+// fileToInt reads an integer value from a sysfs file
+// In case of an error -1 is returned
+func fileToInt(path string) int {
+	buffer, err := os.ReadFile(path)
+	if err != nil {
+		log.Print(err)
+		cclogger.ComponentError("ccTopology", "fileToInt", "Reading", path, ":", err.Error())
+		return -1
+	}
+	stringBuffer := strings.TrimSpace(string(buffer))
+	id, err := strconv.Atoi(stringBuffer)
+	if err != nil {
+		cclogger.ComponentError("ccTopology", "fileToInt", "Parsing", path, ":", stringBuffer, err.Error())
+		return -1
+	}
+	return id
+}
+
+// fileToList reads a list from a sysfs file
+// A list consists of value ranges separated by colon
+// A range can be a single value or a range of values given by a startValue-endValue
+// In case of an error nil is returned
+func fileToList(path string) []int {
+	// Read list
+	buffer, err := os.ReadFile(path)
+	if err != nil {
+		log.Print(err)
+		cclogger.ComponentError("ccTopology", "fileToList", "Reading", path, ":", err.Error())
+		return nil
+	}
+
+	// Create list
+	list := make([]int, 0)
+	stringBuffer := strings.TrimSpace(string(buffer))
+	for _, valueRangeString := range strings.Split(stringBuffer, ",") {
+		valueRange := strings.Split(valueRangeString, "-")
+		switch len(valueRange) {
+		case 1:
+			singleValue, err := strconv.Atoi(valueRange[0])
+			if err != nil {
+				cclogger.ComponentError("CCTopology", "fileToList", "Parsing", valueRange[0], ":", err.Error())
+				return nil
+			}
+			list = append(list, singleValue)
+		case 2:
+			startValue, err := strconv.Atoi(valueRange[0])
+			if err != nil {
+				cclogger.ComponentError("CCTopology", "fileToList", "Parsing", valueRange[0], ":", err.Error())
+				return nil
+			}
+			endValue, err := strconv.Atoi(valueRange[1])
+			if err != nil {
+				cclogger.ComponentError("CCTopology", "fileToList", "Parsing", valueRange[1], ":", err.Error())
+				return nil
+			}
+			for value := startValue; value <= endValue; value++ {
+				list = append(list, value)
+			}
+		}
+	}
+
+	return list
+}
+
+// init initializes the cache structure
+func init() {
+
+	getHWThreads :=
+		func() []int {
+			globPath := filepath.Join(SYSFS_CPUBASE, "cpu[0-9]*")
+			regexPath := filepath.Join(SYSFS_CPUBASE, "cpu([[:digit:]]+)")
+			regex := regexp.MustCompile(regexPath)
+
+			// File globbing for hardware threads
+			files, err := filepath.Glob(globPath)
+			if err != nil {
+				cclogger.ComponentError("CCTopology", "init:getHWThreads", err.Error())
+				return nil
+			}
+
+			hwThreadIDs := make([]int, len(files))
+			for i, file := range files {
+				// Extract hardware thread ID
+				matches := regex.FindStringSubmatch(file)
+				if len(matches) != 2 {
+					cclogger.ComponentError("CCTopology", "init:getHWThreads: Failed to extract hardware thread ID from ", file)
+					return nil
+				}
+
+				// Convert hardware thread ID to int
+				id, err := strconv.Atoi(matches[1])
+				if err != nil {
+					cclogger.ComponentError("CCTopology", "init:getHWThreads: Failed to convert to int hardware thread ID ", matches[1])
+					return nil
+				}
+
+				hwThreadIDs[i] = id
+			}
+
+			// Sort hardware thread IDs
+			slices.Sort(hwThreadIDs)
+			return hwThreadIDs
+		}
+
+	getNumaDomain :=
+		func(basePath string) int {
+			globPath := filepath.Join(basePath, "node*")
+			regexPath := filepath.Join(basePath, "node([[:digit:]]+)")
+			regex := regexp.MustCompile(regexPath)
+
+			// File globbing for NUMA node
+			files, err := filepath.Glob(globPath)
+			if err != nil {
+				cclogger.ComponentError("CCTopology", "init:getNumaDomain", err.Error())
+				return -1
+			}
+
+			// Check, that exactly one NUMA domain was found
+			if len(files) != 1 {
+				cclogger.ComponentError("CCTopology", "init:getNumaDomain", "Number of NUMA domains != 1: ", len(files))
+				return -1
+			}
+
+			// Extract NUMA node ID
+			matches := regex.FindStringSubmatch(files[0])
+			if len(matches) != 2 {
+				cclogger.ComponentError("CCTopology", "init:getNumaDomain", "Failed to extract NUMA node ID from: ", files[0])
+				return -1
+			}
+
+			id, err := strconv.Atoi(matches[1])
+			if err != nil {
+				cclogger.ComponentError("CCTopology", "init:getNumaDomain", "Failed to parse NUMA node ID from: ", matches[1])
+				return -1
+			}
+
+			return id
+		}
+
+	cache.HwthreadList = getHWThreads()
+	cache.CoreList = make([]int, len(cache.HwthreadList))
+	cache.SocketList = make([]int, len(cache.HwthreadList))
+	cache.DieList = make([]int, len(cache.HwthreadList))
+	cache.SMTList = make([]int, len(cache.HwthreadList))
+	cache.NumaDomainList = make([]int, len(cache.HwthreadList))
+	cache.CpuData = make([]HwthreadEntry, len(cache.HwthreadList))
+	for i, c := range cache.HwthreadList {
+		// Set cpuBase directory for topology lookup
+		cpuBase := filepath.Join(SYSFS_CPUBASE, fmt.Sprintf("cpu%d", c))
+		topoBase := filepath.Join(cpuBase, "topology")
+
+		// Lookup Core ID
+		cache.CoreList[i] = fileToInt(filepath.Join(topoBase, "core_id"))
+
+		// Lookup socket / physical package ID
+		cache.SocketList[i] = fileToInt(filepath.Join(topoBase, "physical_package_id"))
+
+		// Lookup CPU die id
+		cache.DieList[i] = fileToInt(filepath.Join(topoBase, "die_id"))
+		if cache.DieList[i] < 0 {
+			cache.DieList[i] = cache.SocketList[i]
+		}
+
+		// Lookup List of CPUs within the same core
+		coreCPUsList := fileToList(filepath.Join(topoBase, "core_cpus_list"))
+
+		// Find index of CPU ID in List of CPUs within the same core
+		// if not found return -1
+		cache.SMTList[i] = slices.Index(coreCPUsList, c)
+
+		// Lookup NUMA domain id
+		cache.NumaDomainList[i] = getNumaDomain(cpuBase)
+
+		cache.CpuData[i] =
+			HwthreadEntry{
+				CpuID:        cache.HwthreadList[i],
+				SMT:          cache.SMTList[i],
+				CoreCPUsList: coreCPUsList,
+				Socket:       cache.SocketList[i],
+				NumaDomain:   cache.NumaDomainList[i],
+				Die:          cache.DieList[i],
+				Core:         cache.CoreList[i],
+			}
+	}
+
+	slices.Sort(cache.HwthreadList)
+	cache.HwthreadList = slices.Compact(cache.HwthreadList)
+
+	slices.Sort(cache.SMTList)
+	cache.SMTList = slices.Compact(cache.SMTList)
+
+	slices.Sort(cache.CoreList)
+	cache.CoreList = slices.Compact(cache.CoreList)
+
+	slices.Sort(cache.SocketList)
+	cache.SocketList = slices.Compact(cache.SocketList)
+
+	slices.Sort(cache.DieList)
+	cache.DieList = slices.Compact(cache.DieList)
+
+	slices.Sort(cache.NumaDomainList)
+	cache.NumaDomainList = slices.Compact(cache.NumaDomainList)
+}
+
+// SocketList gets the list of CPU socket IDs
+func SocketList() []int {
+	return slices.Clone(cache.SocketList)
+}
+
+// HwthreadList gets the list of hardware thread IDs in the order of listing in /proc/cpuinfo
+func HwthreadList() []int {
+	return slices.Clone(cache.HwthreadList)
+}
+
+// Get list of hardware thread IDs in the order of listing in /proc/cpuinfo
+// Deprecated! Use HwthreadList()
+func CpuList() []int {
+	return HwthreadList()
+}
+
+// CoreList gets the list of CPU core IDs in the order of listing in /proc/cpuinfo
+func CoreList() []int {
+	return slices.Clone(cache.CoreList)
+}
+
+// Get list of NUMA node IDs
+func NumaNodeList() []int {
+	return slices.Clone(cache.NumaDomainList)
+}
+
+// DieList gets the list of CPU die IDs
+func DieList() []int {
+	if len(cache.DieList) > 0 {
+		return slices.Clone(cache.DieList)
+	}
+	return SocketList()
+}
+
+// GetTypeList gets the list of specified type using the naming format inside ClusterCockpit
+func GetTypeList(topology_type string) []int {
+	switch topology_type {
+	case "node":
+		return []int{0}
+	case "socket":
+		return SocketList()
+	case "die":
+		return DieList()
+	case "memoryDomain":
+		return NumaNodeList()
+	case "core":
+		return CoreList()
+	case "hwthread":
+		return HwthreadList()
+	}
+	return []int{}
+}
+
+// CpuData returns CPU data for each hardware thread
+func CpuData() []HwthreadEntry {
+	// return a deep copy to protect cache data
+	c := slices.Clone(cache.CpuData)
+	for i := range c {
+		c[i].CoreCPUsList = slices.Clone(cache.CpuData[i].CoreCPUsList)
+	}
+	return c
+}
+
+// Structure holding basic information about a CPU
+type CpuInformation struct {
+	NumHWthreads   int
+	SMTWidth       int
+	NumSockets     int
+	NumDies        int
+	NumCores       int
+	NumNumaDomains int
+}
+
+// CpuInformation reports basic information about the CPU
+func CpuInfo() CpuInformation {
+	return CpuInformation{
+		NumNumaDomains: len(cache.NumaDomainList),
+		SMTWidth:       len(cache.SMTList),
+		NumDies:        len(cache.DieList),
+		NumCores:       len(cache.CoreList),
+		NumSockets:     len(cache.SocketList),
+		NumHWthreads:   len(cache.HwthreadList),
+	}
+}
+
+// GetHwthreadSocket gets the CPU socket ID for a given hardware thread ID
+// In case hardware thread ID is not found -1 is returned
+func GetHwthreadSocket(cpuID int) int {
+	for i := range cache.CpuData {
+		d := &cache.CpuData[i]
+		if d.CpuID == cpuID {
+			return d.Socket
+		}
+	}
+	return -1
+}
+
+// GetHwthreadNumaDomain gets the NUMA domain ID for a given hardware thread ID
+// In case hardware thread ID is not found -1 is returned
+func GetHwthreadNumaDomain(cpuID int) int {
+	for i := range cache.CpuData {
+		d := &cache.CpuData[i]
+		if d.CpuID == cpuID {
+			return d.NumaDomain
+		}
+	}
+	return -1
+}
+
+// GetHwthreadDie gets the CPU die ID for a given hardware thread ID
+// In case hardware thread ID is not found -1 is returned
+func GetHwthreadDie(cpuID int) int {
+	for i := range cache.CpuData {
+		d := &cache.CpuData[i]
+		if d.CpuID == cpuID {
+			return d.Die
+		}
+	}
+	return -1
+}
+
+// GetHwthreadCore gets the CPU core ID for a given hardware thread ID
+// In case hardware thread ID is not found -1 is returned
+func GetHwthreadCore(cpuID int) int {
+	for i := range cache.CpuData {
+		d := &cache.CpuData[i]
+		if d.CpuID == cpuID {
+			return d.Core
+		}
+	}
+	return -1
+}
+
+// GetSocketHwthreads gets all hardware thread IDs associated with a CPU socket
+func GetSocketHwthreads(socket int) []int {
+	cpuList := make([]int, 0)
+	for i := range cache.CpuData {
+		d := &cache.CpuData[i]
+		if d.Socket == socket {
+			cpuList = append(cpuList, d.CpuID)
+		}
+	}
+	return cpuList
+}
+
+// GetNumaDomainHwthreads gets the all hardware thread IDs associated with a NUMA domain
+func GetNumaDomainHwthreads(numaDomain int) []int {
+	cpuList := make([]int, 0)
+	for i := range cache.CpuData {
+		d := &cache.CpuData[i]
+		if d.NumaDomain == numaDomain {
+			cpuList = append(cpuList, d.CpuID)
+		}
+	}
+	return cpuList
+}
+
+// GetDieHwthreads gets all hardware thread IDs associated with a CPU die
+func GetDieHwthreads(die int) []int {
+	cpuList := make([]int, 0)
+	for i := range cache.CpuData {
+		d := &cache.CpuData[i]
+		if d.Die == die {
+			cpuList = append(cpuList, d.CpuID)
+		}
+	}
+	return cpuList
+}
+
+// GetCoreHwthreads get all hardware thread IDs associated with a CPU core
+func GetCoreHwthreads(core int) []int {
+	cpuList := make([]int, 0)
+	for i := range cache.CpuData {
+		d := &cache.CpuData[i]
+		if d.Core == core {
+			cpuList = append(cpuList, d.CpuID)
+		}
+	}
+	return cpuList
+}
--- a/pkg/hostlist/hostlist.go
+++ b/pkg/hostlist/hostlist.go
@@ -0,0 +1,125 @@
+package hostlist
+
+import (
+	"fmt"
+	"regexp"
+	"sort"
+	"strconv"
+	"strings"
+)
+
+func Expand(in string) (result []string, err error) {
+
+	// Create ranges regular expression
+	reStNumber := "[[:digit:]]+"
+	reStRange := reStNumber + "-" + reStNumber
+	reStOptionalNumberOrRange := "(" + reStNumber + ",|" + reStRange + ",)*"
+	reStNumberOrRange := "(" + reStNumber + "|" + reStRange + ")"
+	reStBraceLeft := "[[]"
+	reStBraceRight := "[]]"
+	reStRanges := reStBraceLeft +
+		reStOptionalNumberOrRange +
+		reStNumberOrRange +
+		reStBraceRight
+	reRanges := regexp.MustCompile(reStRanges)
+
+	// Create host list regular expression
+	reStDNSChars := "[a-zA-Z0-9-]+"
+	reStPrefix := "^(" + reStDNSChars + ")"
+	reStOptionalSuffix := "(" + reStDNSChars + ")?"
+	re := regexp.MustCompile(reStPrefix + "([[][0-9,-]+[]])?" + reStOptionalSuffix)
+
+	// Remove all delimiters from the input
+	in = strings.TrimLeft(in, ", ")
+
+	for len(in) > 0 {
+		if v := re.FindStringSubmatch(in); v != nil {
+
+			// Remove matched part from the input
+			lenPrefix := len(v[0])
+			in = in[lenPrefix:]
+
+			// Remove all delimiters from the input
+			in = strings.TrimLeft(in, ", ")
+
+			// matched prefix, range and suffix
+			hlPrefix := v[1]
+			hlRanges := v[2]
+			hlSuffix := v[3]
+
+			// Single node without ranges
+			if hlRanges == "" {
+				result = append(result, hlPrefix)
+				continue
+			}
+
+			// Node with ranges
+			if v := reRanges.FindStringSubmatch(hlRanges); v != nil {
+
+				// Remove braces
+				hlRanges = hlRanges[1 : len(hlRanges)-1]
+
+				// Split host ranges at ,
+				for _, hlRange := range strings.Split(hlRanges, ",") {
+
+					// Split host range at -
+					RangeStartEnd := strings.Split(hlRange, "-")
+
+					// Range is only a single number
+					if len(RangeStartEnd) == 1 {
+						result = append(result, hlPrefix+RangeStartEnd[0]+hlSuffix)
+						continue
+					}
+
+					// Range has a start and an end
+					widthRangeStart := len(RangeStartEnd[0])
+					widthRangeEnd := len(RangeStartEnd[1])
+					iStart, _ := strconv.ParseUint(RangeStartEnd[0], 10, 64)
+					iEnd, _ := strconv.ParseUint(RangeStartEnd[1], 10, 64)
+					if iStart > iEnd {
+						return nil, fmt.Errorf("single range start is greater than end: %s", hlRange)
+					}
+
+					// Create print format string for range numbers
+					doPadding := widthRangeStart == widthRangeEnd
+					widthPadding := widthRangeStart
+					var formatString string
+					if doPadding {
+						formatString = "%0" + fmt.Sprint(widthPadding) + "d"
+					} else {
+						formatString = "%d"
+					}
+					formatString = hlPrefix + formatString + hlSuffix
+
+					// Add nodes from this range
+					for i := iStart; i <= iEnd; i++ {
+						result = append(result, fmt.Sprintf(formatString, i))
+					}
+				}
+			} else {
+				return nil, fmt.Errorf("not at hostlist range: %s", hlRanges)
+			}
+		} else {
+			return nil, fmt.Errorf("not a hostlist: %s", in)
+		}
+	}
+
+	if result != nil {
+		// sort
+		sort.Strings(result)
+
+		// uniq
+		previous := 1
+		for current := 1; current < len(result); current++ {
+			if result[current-1] != result[current] {
+				if previous != current {
+					result[previous] = result[current]
+				}
+				previous++
+			}
+		}
+		result = result[:previous]
+	}
+
+	return
+}
--- a/pkg/hostlist/hostlist_test.go
+++ b/pkg/hostlist/hostlist_test.go
@@ -0,0 +1,126 @@
+package hostlist
+
+import (
+	"testing"
+)
+
+func TestExpand(t *testing.T) {
+
+	// Compare two slices of strings
+	equal := func(a, b []string) bool {
+		if len(a) != len(b) {
+			return false
+		}
+		for i, v := range a {
+			if v != b[i] {
+				return false
+			}
+		}
+		return true
+	}
+
+	type testDefinition struct {
+		input          string
+		resultExpected []string
+		errorExpected  bool
+	}
+
+	expandTests := []testDefinition{
+		{
+			// Single node
+			input:          "n1",
+			resultExpected: []string{"n1"},
+			errorExpected:  false,
+		},
+		{
+			// Single node, duplicated
+			input:          "n1,n1",
+			resultExpected: []string{"n1"},
+			errorExpected:  false,
+		},
+		{
+			// Single node with padding
+			input:          "n[01]",
+			resultExpected: []string{"n01"},
+			errorExpected:  false,
+		},
+		{
+			// Single node with suffix
+			input:          "n[01]-p",
+			resultExpected: []string{"n01-p"},
+			errorExpected:  false,
+		},
+		{
+			// Multiple nodes with a single range
+			input:          "n[1-2]",
+			resultExpected: []string{"n1", "n2"},
+			errorExpected:  false,
+		},
+		{
+			// Multiple nodes with a single range and a single index
+			input:          "n[1-2,3]",
+			resultExpected: []string{"n1", "n2", "n3"},
+			errorExpected:  false,
+		},
+		{
+			// Multiple nodes with different prefixes
+			input:          "n[1-2],m[1,2]",
+			resultExpected: []string{"m1", "m2", "n1", "n2"},
+			errorExpected:  false,
+		},
+		{
+			// Multiple nodes with different suffixes
+			input:          "n[1-2]-p,n[1,2]-q",
+			resultExpected: []string{"n1-p", "n1-q", "n2-p", "n2-q"},
+			errorExpected:  false,
+		},
+		{
+			// Multiple nodes with and without node ranges
+			input:          " n09, n[01-04,06-07,09] , , n10,n04",
+			resultExpected: []string{"n01", "n02", "n03", "n04", "n06", "n07", "n09", "n10"},
+			errorExpected:  false,
+		},
+		{
+			// Forbidden DNS character
+			input:          "n@",
+			resultExpected: []string{},
+			errorExpected:  true,
+		},
+		{
+			// Forbidden range
+			input:          "n[1-2-2,3]",
+			resultExpected: []string{},
+			errorExpected:  true,
+		},
+		{
+			// Forbidden range limits
+			input:          "n[2-1]",
+			resultExpected: []string{},
+			errorExpected:  true,
+		},
+	}
+
+	for _, expandTest := range expandTests {
+		result, err := Expand(expandTest.input)
+
+		hasError := err != nil
+		if hasError != expandTest.errorExpected && hasError {
+			t.Errorf("Expand('%s') failed: unexpected error '%v'",
+				expandTest.input, err)
+			continue
+		}
+		if hasError != expandTest.errorExpected && !hasError {
+			t.Errorf("Expand('%s') did not fail as expected: got result '%+v'",
+				expandTest.input, result)
+			continue
+		}
+		if !hasError && !equal(result, expandTest.resultExpected) {
+			t.Errorf("Expand('%s') failed: got result '%+v', expected result '%v'",
+				expandTest.input, result, expandTest.resultExpected)
+			continue
+		}
+
+		t.Logf("Checked hostlist.Expand('%s'): result = '%+v', err = '%v'",
+			expandTest.input, result, err)
+	}
+}
--- a/internal/multiChanTicker/README.md
+++ b/internal/multiChanTicker/README.md
--- a/internal/multiChanTicker/multiChanTicker.go
+++ b/internal/multiChanTicker/multiChanTicker.go
@@ -3,7 +3,7 @@ package multiChanTicker
 import (
 	"time"

-	cclog "github.com/ClusterCockpit/cc-metric-collector/internal/ccLogger"
+	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
 )

 type multiChanTicker struct {
--- a/receivers.json
+++ b/receivers.json
@@ -1,8 +1,44 @@
-[
-    {
+{
+    "natsrecv": {
        "type": "nats",
        "address": "nats://my-url",
-        "port" : "4222",
+        "port": "4222",
        "database": "testcluster"
+    },
+    "redfish_recv": {
+        "type": "redfish",
+        "endpoint": "https://%h-bmc",
+        "client_config": [
+            {
+                "host_list": "my-host-1-[1-2]",
+                "username": "username-1",
+                "password": "password-1"
+            },
+            {
+                "host_list": "my-host-2-[1,2]",
+                "username": "username-2",
+                "password": "password-2"
+            }
+        ]
+    },
+    "ipmi_recv": {
+        "type": "ipmi",
+        "endpoint": "ipmi-sensors://%h-ipmi",
+        "exclude_metrics": [
+            "fan_speed",
+            "voltage"
+        ],
+        "client_config": [
+            {
+                "username": "username-1",
+                "password": "password-1",
+                "host_list": "my-host-1-[1-2]"
+            },
+            {
+                "username": "username-2",
+                "password": "password-2",
+                "host_list": "my-host-2-[1,2]"
+            }
+        ]
    }
-]
+}
--- a/receivers/README.md
+++ b/receivers/README.md
@@ -2,43 +2,32 @@

 This folder contains the ReceiveManager and receiver implementations for the cc-metric-collector.

-# Configuration
+## Configuration

 The configuration file for the receivers is a list of configurations. The `type` field in each specifies which receiver to initialize.

-```json
-[
-  {
-    "type": "nats",
-    "address": "nats://my-url",
-    "port" : "4222",
-    "database": "testcluster"
-  }
-]
-```
-
-
-## Type `nats`
-
 ```json
 {
-  "type": "nats",
-  "address": "<nats-URI or hostname>",
-  "port" : "<portnumber>",
-  "database": "<subscribe topic>"
+  "myreceivername" : {
+    "type": "receiver-type",
+    <receiver-specific configuration>
+  }
 }
 ```

-The `nats` receiver subscribes to the topic `database` and listens on `address` and `port` for metrics in the InfluxDB line protocol.
+This allows to specify

-# Contributing own receivers
-A receiver contains three functions and is derived from the type `Receiver` (in `metricReceiver.go`):
-* `Init(config ReceiverConfig) error`
-* `Start() error`
-* `Close()`
-* `Name() string`
-* `SetSink(sink chan ccMetric.CCMetric)`
+## Available receivers

-The data structures should be set up in `Init()` like opening a file or server connection. The `Start()` function should either start a go routine or issue some other asynchronous mechanism for receiving metrics. The `Close()` function should tear down anything created in `Init()`.
+- [`nats`](./natsReceiver.md): Receive metrics from the NATS network
+- [`prometheus`](./prometheusReceiver.md): Scrape data from a Prometheus client
+- [`http`](./httpReceiver.md): Listen for HTTP Post requests transporting metrics in InfluxDB line protocol
+- [`ipmi`](./ipmiReceiver.md): Read IPMI sensor readings
+- [`redfish`](redfishReceiver.md) Use the Redfish (specification) to query thermal and power metrics
+- [`snmp`](./snmpReceiver.md) Query SNMP endpoints in the network

-Finally, the receiver needs to be registered in the `receiveManager.go`. There is a list of receivers called `AvailableReceivers` which is a map (`receiver_type_string` -> `pointer to Receiver interface`). Add a new entry with a descriptive name and the new receiver.
+## Contributing own receivers
+
+A receiver contains a few functions and is derived from the type `Receiver` (in `metricReceiver.go`):
+
+For an example, check the [sample receiver](./sampleReceiver.go)
--- a/receivers/httpReceiver.go
+++ b/receivers/httpReceiver.go
@@ -0,0 +1,227 @@
+package receivers
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"net/http"
+	"strings"
+	"sync"
+	"time"
+
+	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
+	influx "github.com/influxdata/line-protocol/v2/lineprotocol"
+)
+
+const HTTP_RECEIVER_PORT = "8080"
+
+type HttpReceiverConfig struct {
+	Type string `json:"type"`
+	Addr string `json:"address"`
+	Port string `json:"port"`
+	Path string `json:"path"`
+
+	// Maximum amount of time to wait for the next request when keep-alives are enabled
+	// should be larger than the measurement interval to keep the connection open
+	IdleTimeout string `json:"idle_timeout"`
+	idleTimeout time.Duration
+
+	// Controls whether HTTP keep-alives are enabled. By default, keep-alives are enabled
+	KeepAlivesEnabled bool `json:"keep_alives_enabled"`
+
+	// Basic authentication
+	Username     string `json:"username"`
+	Password     string `json:"password"`
+	useBasicAuth bool
+}
+
+type HttpReceiver struct {
+	receiver
+	meta   map[string]string
+	config HttpReceiverConfig
+	server *http.Server
+	wg     sync.WaitGroup
+}
+
+func (r *HttpReceiver) Init(name string, config json.RawMessage) error {
+	r.name = fmt.Sprintf("HttpReceiver(%s)", name)
+
+	// Set default values
+	r.config.Port = HTTP_RECEIVER_PORT
+	r.config.KeepAlivesEnabled = true
+	// should be larger than the measurement interval to keep the connection open
+	r.config.IdleTimeout = "120s"
+
+	// Read config
+	if len(config) > 0 {
+		err := json.Unmarshal(config, &r.config)
+		if err != nil {
+			cclog.ComponentError(r.name, "Error reading config:", err.Error())
+			return err
+		}
+	}
+	if len(r.config.Port) == 0 {
+		return errors.New("not all configuration variables set required by HttpReceiver")
+	}
+
+	// Check idle timeout config
+	if len(r.config.IdleTimeout) > 0 {
+		t, err := time.ParseDuration(r.config.IdleTimeout)
+		if err == nil {
+			cclog.ComponentDebug(r.name, "idleTimeout", t)
+			r.config.idleTimeout = t
+		}
+	}
+
+	// Check basic authentication config
+	if len(r.config.Username) > 0 || len(r.config.Password) > 0 {
+		r.config.useBasicAuth = true
+	}
+	if r.config.useBasicAuth && len(r.config.Username) == 0 {
+		return errors.New("basic authentication requires username")
+	}
+	if r.config.useBasicAuth && len(r.config.Password) == 0 {
+		return errors.New("basic authentication requires password")
+	}
+
+	r.meta = map[string]string{"source": r.name}
+	p := r.config.Path
+	if !strings.HasPrefix(p, "/") {
+		p = "/" + p
+	}
+	addr := fmt.Sprintf("%s:%s", r.config.Addr, r.config.Port)
+	uri := addr + p
+	cclog.ComponentDebug(r.name, "INIT", "listen on:", uri)
+
+	// Register handler function r.ServerHttp for path p in the DefaultServeMux
+	http.HandleFunc(p, r.ServerHttp)
+
+	// Create http server
+	r.server = &http.Server{
+		Addr:        addr,
+		Handler:     nil, // handler to invoke, http.DefaultServeMux if nil
+		IdleTimeout: r.config.idleTimeout,
+	}
+	r.server.SetKeepAlivesEnabled(r.config.KeepAlivesEnabled)
+
+	return nil
+}
+
+func (r *HttpReceiver) Start() {
+	cclog.ComponentDebug(r.name, "START")
+	r.wg.Add(1)
+	go func() {
+		err := r.server.ListenAndServe()
+		if err != nil && err.Error() != "http: Server closed" {
+			cclog.ComponentError(r.name, err.Error())
+		}
+		r.wg.Done()
+	}()
+}
+
+func (r *HttpReceiver) ServerHttp(w http.ResponseWriter, req *http.Request) {
+
+	// Check request method, only post method is handled
+	if req.Method != http.MethodPost {
+		http.Error(w, "Method Not Allowed", http.StatusMethodNotAllowed)
+		return
+	}
+
+	// Check basic authentication
+	if r.config.useBasicAuth {
+		username, password, ok := req.BasicAuth()
+		if !ok || username != r.config.Username || password != r.config.Password {
+			http.Error(w, "Unauthorized", http.StatusUnauthorized)
+			return
+		}
+	}
+
+	d := influx.NewDecoder(req.Body)
+	for d.Next() {
+
+		// Decode measurement name
+		measurement, err := d.Measurement()
+		if err != nil {
+			msg := "ServerHttp: Failed to decode measurement: " + err.Error()
+			cclog.ComponentError(r.name, msg)
+			http.Error(w, msg, http.StatusInternalServerError)
+			return
+		}
+
+		// Decode tags
+		tags := make(map[string]string)
+		for {
+			key, value, err := d.NextTag()
+			if err != nil {
+				msg := "ServerHttp: Failed to decode tag: " + err.Error()
+				cclog.ComponentError(r.name, msg)
+				http.Error(w, msg, http.StatusInternalServerError)
+				return
+			}
+			if key == nil {
+				break
+			}
+			tags[string(key)] = string(value)
+		}
+
+		// Decode fields
+		fields := make(map[string]interface{})
+		for {
+			key, value, err := d.NextField()
+			if err != nil {
+				msg := "ServerHttp: Failed to decode field: " + err.Error()
+				cclog.ComponentError(r.name, msg)
+				http.Error(w, msg, http.StatusInternalServerError)
+				return
+			}
+			if key == nil {
+				break
+			}
+			fields[string(key)] = value.Interface()
+		}
+
+		// Decode time stamp
+		t, err := d.Time(influx.Nanosecond, time.Time{})
+		if err != nil {
+			msg := "ServerHttp: Failed to decode time stamp: " + err.Error()
+			cclog.ComponentError(r.name, msg)
+			http.Error(w, msg, http.StatusInternalServerError)
+			return
+		}
+
+		y, _ := lp.New(
+			string(measurement),
+			tags,
+			r.meta,
+			fields,
+			t,
+		)
+
+		if r.sink != nil {
+			r.sink <- y
+		}
+	}
+
+	// Check for IO errors
+	err := d.Err()
+	if err != nil {
+		msg := "ServerHttp: Failed to decode: " + err.Error()
+		cclog.ComponentError(r.name, msg)
+		http.Error(w, msg, http.StatusInternalServerError)
+		return
+	}
+
+	w.WriteHeader(http.StatusOK)
+}
+
+func (r *HttpReceiver) Close() {
+	r.server.Shutdown(context.Background())
+}
+
+func NewHttpReceiver(name string, config json.RawMessage) (Receiver, error) {
+	r := new(HttpReceiver)
+	err := r.Init(name, config)
+	return r, err
+}
--- a/receivers/httpReceiver.md
+++ b/receivers/httpReceiver.md
@@ -0,0 +1,43 @@
+## `http` receiver
+
+The `http` receiver can be used receive metrics through HTTP POST requests.
+
+### Configuration structure
+
+```json
+{
+  "<name>": {
+    "type": "http",
+    "address" : "",
+    "port" : "8080",
+    "path" : "/write",
+    "idle_timeout": "120s",
+    "username": "myUser",
+    "password": "myPW"
+  }
+}
+```
+
+- `type`: makes the receiver a `http` receiver
+- `address`: Listen address
+- `port`: Listen port
+- `path`: URL path for the write endpoint
+- `idle_timeout`: Maximum amount of time to wait for the next request when keep-alives are enabled should be larger than the measurement interval to keep the connection open
+- `keep_alives_enabled`: Controls whether HTTP keep-alives are enabled. By default, keep-alives are enabled.
+- `username`: username for basic authentication
+- `password`: password for basic authentication
+
+The HTTP endpoint listens to `http://<address>:<port>/<path>`
+
+### Debugging
+
+- Install [curl](https://curl.se/)
+- Use curl to send message to `http` receiver
+
+  ```bash
+  curl http://localhost:8080/write \
+  --user "myUser:myPW" \
+  --data \
+  "myMetric,hostname=myHost,type=hwthread,type-id=0,unit=Hz value=400000i 1694777161164284635
+  myMetric,hostname=myHost,type=hwthread,type-id=1,unit=Hz value=400001i 1694777161164284635"
+  ```
--- a/receivers/ipmiReceiver.go
+++ b/receivers/ipmiReceiver.go
@@ -0,0 +1,534 @@
+package receivers
+
+import (
+	"bufio"
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"io"
+	"os/exec"
+	"regexp"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+
+	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
+	"github.com/ClusterCockpit/cc-metric-collector/pkg/hostlist"
+)
+
+type IPMIReceiverClientConfig struct {
+
+	// Hostname the IPMI service belongs to
+	Protocol         string            // Protocol / tool to use for IPMI sensor reading
+	DriverType       string            // Out of band IPMI driver
+	Fanout           int               // Maximum number of simultaneous IPMI connections
+	NumHosts         int               // Number of remote IPMI devices with the same configuration
+	IPMIHosts        string            // List of remote IPMI devices to communicate with
+	IPMI2HostMapping map[string]string // Mapping between IPMI device name and host name
+	Username         string            // User name to authenticate with
+	Password         string            // Password to use for authentication
+	CLIOptions       []string          // Additional command line options for ipmi-sensors
+	isExcluded       map[string]bool   // is metric excluded
+}
+
+type IPMIReceiver struct {
+	receiver
+	config struct {
+		Interval time.Duration
+
+		// Client config for each IPMI hosts
+		ClientConfigs []IPMIReceiverClientConfig
+	}
+
+	// Storage for static information
+	meta map[string]string
+
+	done chan bool      // channel to finish / stop IPMI receiver
+	wg   sync.WaitGroup // wait group for IPMI receiver
+}
+
+// doReadMetrics reads metrics from all configure IPMI hosts.
+func (r *IPMIReceiver) doReadMetric() {
+	for i := range r.config.ClientConfigs {
+		clientConfig := &r.config.ClientConfigs[i]
+		var cmd_options []string
+		if clientConfig.Protocol == "ipmi-sensors" {
+			cmd_options = append(cmd_options,
+				"--always-prefix",
+				"--sdr-cache-recreate",
+				// Attempt to interpret OEM data, such as event data, sensor readings, or general extra info
+				"--interpret-oem-data",
+				// Ignore not-available (i.e. N/A) sensors in output
+				"--ignore-not-available-sensors",
+				// Ignore unrecognized sensor events
+				"--ignore-unrecognized-events",
+				// Output fields in comma separated format
+				"--comma-separated-output",
+				// Do not output column headers
+				"--no-header-output",
+				// Output non-abbreviated units (e.g. 'Amps' instead of 'A').
+				// May aid in disambiguation of units (e.g. 'C' for Celsius or Coulombs).
+				"--non-abbreviated-units",
+				"--fanout", fmt.Sprint(clientConfig.Fanout),
+				"--driver-type", clientConfig.DriverType,
+				"--hostname", clientConfig.IPMIHosts,
+				"--username", clientConfig.Username,
+				"--password", clientConfig.Password,
+			)
+			cmd_options := append(cmd_options, clientConfig.CLIOptions...)
+
+			command := exec.Command("ipmi-sensors", cmd_options...)
+			stdout, _ := command.StdoutPipe()
+			errBuf := new(bytes.Buffer)
+			command.Stderr = errBuf
+
+			// start command
+			if err := command.Start(); err != nil {
+				cclog.ComponentError(
+					r.name,
+					fmt.Sprintf("doReadMetric(): Failed to start command \"%s\": %v", command.String(), err),
+				)
+				continue
+			}
+
+			// Read command output
+			const (
+				idxID = iota
+				idxName
+				idxType
+				idxReading
+				idxUnits
+				idxEvent
+			)
+			numPrefixRegex := regexp.MustCompile("^[[:digit:]][[:digit:]]-(.*)$")
+			scanner := bufio.NewScanner(stdout)
+			for scanner.Scan() {
+				// Read host
+				v1 := strings.Split(scanner.Text(), ": ")
+				if len(v1) != 2 {
+					continue
+				}
+				host, ok := clientConfig.IPMI2HostMapping[v1[0]]
+				if !ok {
+					continue
+				}
+
+				// Read sensors
+				v2 := strings.Split(v1[1], ",")
+				if len(v2) != 6 {
+					continue
+				}
+				// Skip sensors with non available sensor readings
+				if v2[idxReading] == "N/A" {
+					continue
+				}
+
+				metric := strings.ToLower(v2[idxType])
+				name := strings.ToLower(
+					strings.Replace(
+						strings.TrimSpace(
+							v2[idxName]), " ", "_", -1))
+				// remove prefix enumeration like 01-...
+				if v := numPrefixRegex.FindStringSubmatch(name); v != nil {
+					name = v[1]
+				}
+				unit := v2[idxUnits]
+				if unit == "Watts" {
+
+					// Power
+					metric = "power"
+					name = strings.TrimSuffix(name, "_power")
+					name = strings.TrimSuffix(name, "_pwr")
+					name = strings.TrimPrefix(name, "pwr_")
+				} else if metric == "voltage" &&
+					unit == "Volts" {
+
+					// Voltage
+					name = strings.TrimPrefix(name, "volt_")
+				} else if metric == "current" &&
+					unit == "Amps" {
+
+					// Current
+					unit = "Ampere"
+				} else if metric == "temperature" &&
+					unit == "degrees C" {
+
+					// Temperature
+					name = strings.TrimSuffix(name, "_temp")
+					unit = "degC"
+				} else if metric == "temperature" &&
+					unit == "degrees F" {
+
+					// Temperature
+					name = strings.TrimSuffix(name, "_temp")
+					unit = "degF"
+				} else if metric == "fan" && unit == "RPM" {
+
+					// Fan speed
+					metric = "fan_speed"
+					name = strings.TrimSuffix(name, "_tach")
+					name = strings.TrimPrefix(name, "spd_")
+				} else if (metric == "cooling device" ||
+					metric == "other units based sensor") &&
+					name == "system_air_flow" &&
+					unit == "CFM" {
+
+					// Air flow
+					metric = "air_flow"
+					name = strings.TrimSuffix(name, "_air_flow")
+					unit = "CubicFeetPerMinute"
+				} else if (metric == "processor" ||
+					metric == "other units based sensor") &&
+					(name == "cpu_utilization" ||
+						name == "io_utilization" ||
+						name == "mem_utilization" ||
+						name == "sys_utilization") &&
+					(unit == "unspecified" ||
+						unit == "%") {
+
+					// Utilization
+					metric = "utilization"
+					name = strings.TrimSuffix(name, "_utilization")
+					unit = "percent"
+				} else {
+					if false {
+						// Debug output for unprocessed metrics
+						fmt.Printf(
+							"host: '%s', metric: '%s', name: '%s', unit: '%s'\n",
+							host, metric, name, unit)
+					}
+					continue
+				}
+
+				// Skip excluded metrics
+				if clientConfig.isExcluded[metric] {
+					continue
+				}
+
+				// Parse sensor value
+				value, err := strconv.ParseFloat(v2[idxReading], 64)
+				if err != nil {
+					continue
+				}
+
+				y, err := lp.New(
+					metric,
+					map[string]string{
+						"hostname": host,
+						"type":     "node",
+						"name":     name,
+					},
+					map[string]string{
+						"source": r.name,
+						"group":  "IPMI",
+						"unit":   unit,
+					},
+					map[string]interface{}{
+						"value": value,
+					},
+					time.Now())
+				if err == nil {
+					r.sink <- y
+				}
+			}
+
+			// Wait for command end
+			if err := command.Wait(); err != nil {
+				errMsg, _ := io.ReadAll(errBuf)
+				cclog.ComponentError(
+					r.name,
+					fmt.Sprintf("doReadMetric(): Failed to wait for the end of command \"%s\": %v\n",
+						strings.Replace(command.String(), clientConfig.Password, "<PW>", -1), err),
+					fmt.Sprintf("doReadMetric(): command stderr: \"%s\"\n", string(errMsg)),
+				)
+			}
+		}
+	}
+}
+
+func (r *IPMIReceiver) Start() {
+	cclog.ComponentDebug(r.name, "START")
+
+	// Start IPMI receiver
+	r.wg.Add(1)
+	go func() {
+		defer r.wg.Done()
+
+		// Create ticker
+		ticker := time.NewTicker(r.config.Interval)
+		defer ticker.Stop()
+
+		for {
+			r.doReadMetric()
+
+			select {
+			case tickerTime := <-ticker.C:
+				// Check if we missed the ticker event
+				if since := time.Since(tickerTime); since > 5*time.Second {
+					cclog.ComponentInfo(r.name, "Missed ticker event for more then", since)
+				}
+
+				// process ticker event -> continue
+				continue
+			case <-r.done:
+				// process done event
+				return
+			}
+		}
+	}()
+
+	cclog.ComponentDebug(r.name, "STARTED")
+}
+
+// Close receiver: close network connection, close files, close libraries, ...
+func (r *IPMIReceiver) Close() {
+	cclog.ComponentDebug(r.name, "CLOSE")
+
+	// Send the signal and wait
+	close(r.done)
+	r.wg.Wait()
+
+	cclog.ComponentDebug(r.name, "DONE")
+}
+
+// NewIPMIReceiver creates a new instance of the redfish receiver
+// Initialize the receiver by giving it a name and reading in the config JSON
+func NewIPMIReceiver(name string, config json.RawMessage) (Receiver, error) {
+	r := new(IPMIReceiver)
+
+	// Config options from config file
+	configJSON := struct {
+		Type string `json:"type"`
+
+		// How often the IPMI sensor metrics should be read and send to the sink (default: 30 s)
+		IntervalString string `json:"interval,omitempty"`
+
+		// Maximum number of simultaneous IPMI connections (default: 64)
+		Fanout int `json:"fanout,omitempty"`
+
+		// Out of band IPMI driver (default: LAN_2_0)
+		DriverType string `json:"driver_type,omitempty"`
+
+		// Default client username, password and endpoint
+		Username *string `json:"username"` // User name to authenticate with
+		Password *string `json:"password"` // Password to use for authentication
+		Endpoint *string `json:"endpoint"` // URL of the IPMI device
+
+		// Globally excluded metrics
+		ExcludeMetrics []string `json:"exclude_metrics,omitempty"`
+
+		ClientConfigs []struct {
+			Fanout     int     `json:"fanout,omitempty"`      // Maximum number of simultaneous IPMI connections (default: 64)
+			DriverType string  `json:"driver_type,omitempty"` // Out of band IPMI driver (default: LAN_2_0)
+			HostList   string  `json:"host_list"`             // List of hosts with the same client configuration
+			Username   *string `json:"username"`              // User name to authenticate with
+			Password   *string `json:"password"`              // Password to use for authentication
+			Endpoint   *string `json:"endpoint"`              // URL of the IPMI service
+
+			// Per client excluded metrics
+			ExcludeMetrics []string `json:"exclude_metrics,omitempty"`
+
+			// Additional command line options for ipmi-sensors
+			CLIOptions []string `json:"cli_options,omitempty"`
+		} `json:"client_config"`
+	}{
+		// Set defaults values
+		// Allow overwriting these defaults by reading config JSON
+		Fanout:         64,
+		DriverType:     "LAN_2_0",
+		IntervalString: "30s",
+	}
+
+	// Set name of IPMIReceiver
+	r.name = fmt.Sprintf("IPMIReceiver(%s)", name)
+
+	// Create done channel
+	r.done = make(chan bool)
+
+	// Set static information
+	r.meta = map[string]string{"source": r.name}
+
+	// Read the IPMI receiver specific JSON config
+	if len(config) > 0 {
+		d := json.NewDecoder(bytes.NewReader(config))
+		d.DisallowUnknownFields()
+		if err := d.Decode(&configJSON); err != nil {
+			cclog.ComponentError(r.name, "Error reading config:", err.Error())
+			return nil, err
+		}
+	}
+
+	// Convert interval string representation to duration
+	var err error
+	r.config.Interval, err = time.ParseDuration(configJSON.IntervalString)
+	if err != nil {
+		err := fmt.Errorf(
+			"Failed to parse duration string interval='%s': %w",
+			configJSON.IntervalString,
+			err,
+		)
+		cclog.Error(r.name, err)
+		return nil, err
+	}
+
+	// Create client config from JSON config
+	totalNumHosts := 0
+	for i := range configJSON.ClientConfigs {
+		clientConfigJSON := &configJSON.ClientConfigs[i]
+
+		var endpoint string
+		if clientConfigJSON.Endpoint != nil {
+			endpoint = *clientConfigJSON.Endpoint
+		} else if configJSON.Endpoint != nil {
+			endpoint = *configJSON.Endpoint
+		} else {
+			err := fmt.Errorf("client config number %v requires endpoint", i)
+			cclog.ComponentError(r.name, err)
+			return nil, err
+		}
+
+		fanout := configJSON.Fanout
+		if clientConfigJSON.Fanout != 0 {
+			fanout = clientConfigJSON.Fanout
+		}
+
+		driverType := configJSON.DriverType
+		if clientConfigJSON.DriverType != "" {
+			driverType = clientConfigJSON.DriverType
+		}
+		if driverType != "LAN" && driverType != "LAN_2_0" {
+			err := fmt.Errorf("client config number %v has invalid driver type %s", i, driverType)
+			cclog.ComponentError(r.name, err)
+			return nil, err
+		}
+
+		var protocol string
+		var host_pattern string
+		if e := strings.Split(endpoint, "://"); len(e) == 2 {
+			protocol = e[0]
+			host_pattern = e[1]
+		} else {
+			err := fmt.Errorf("client config number %v has invalid endpoint %s", i, endpoint)
+			cclog.ComponentError(r.name, err)
+			return nil, err
+		}
+
+		var username string
+		if clientConfigJSON.Username != nil {
+			username = *clientConfigJSON.Username
+		} else if configJSON.Username != nil {
+			username = *configJSON.Username
+		} else {
+			err := fmt.Errorf("client config number %v requires username", i)
+			cclog.ComponentError(r.name, err)
+			return nil, err
+		}
+
+		var password string
+		if clientConfigJSON.Password != nil {
+			password = *clientConfigJSON.Password
+		} else if configJSON.Password != nil {
+			password = *configJSON.Password
+		} else {
+			err := fmt.Errorf("client config number %v requires password", i)
+			cclog.ComponentError(r.name, err)
+			return nil, err
+		}
+
+		// Create mapping between IPMI host name and node host name
+		// This also guaranties that all IPMI host names are unique
+		ipmi2HostMapping := make(map[string]string)
+		hostList, err := hostlist.Expand(clientConfigJSON.HostList)
+		if err != nil {
+			err := fmt.Errorf("client config number %d failed to parse host list %s: %v",
+				i, clientConfigJSON.HostList, err)
+			cclog.ComponentError(r.name, err)
+			return nil, err
+		}
+		for _, host := range hostList {
+			ipmiHost := strings.Replace(host_pattern, "%h", host, -1)
+			ipmi2HostMapping[ipmiHost] = host
+		}
+
+		numHosts := len(ipmi2HostMapping)
+		totalNumHosts += numHosts
+		ipmiHostList := make([]string, 0, numHosts)
+		for ipmiHost := range ipmi2HostMapping {
+			ipmiHostList = append(ipmiHostList, ipmiHost)
+		}
+
+		// Additional command line options
+		for _, v := range clientConfigJSON.CLIOptions {
+			switch {
+			case v == "-u" || strings.HasPrefix(v, "--username"):
+				err := fmt.Errorf("client config number %v: do not set username in cli_options. Use json config username instead", i)
+				cclog.ComponentError(r.name, err)
+				return nil, err
+			case v == "-p" || strings.HasPrefix(v, "--password"):
+				err := fmt.Errorf("client config number %v: do not set password in cli_options. Use json config password instead", i)
+				cclog.ComponentError(r.name, err)
+				return nil, err
+			case v == "-h" || strings.HasPrefix(v, "--hostname"):
+				err := fmt.Errorf("client config number %v: do not set hostname in cli_options. Use json config host_list instead", i)
+				cclog.ComponentError(r.name, err)
+				return nil, err
+			case v == "-D" || strings.HasPrefix(v, "--driver-type"):
+				err := fmt.Errorf("client config number %v: do not set driver type in cli_options. Use json config driver_type instead", i)
+				cclog.ComponentError(r.name, err)
+				return nil, err
+			case v == "-F" || strings.HasPrefix(v, " --fanout"):
+				err := fmt.Errorf("client config number %v: do not set fanout in cli_options. Use json config fanout instead", i)
+				cclog.ComponentError(r.name, err)
+				return nil, err
+			case v == "--always-prefix" ||
+				v == "--sdr-cache-recreate" ||
+				v == "--interpret-oem-data" ||
+				v == "--ignore-not-available-sensors" ||
+				v == "--ignore-unrecognized-events" ||
+				v == "--comma-separated-output" ||
+				v == "--no-header-output" ||
+				v == "--non-abbreviated-units":
+				err := fmt.Errorf("client config number %v: Do not use option %s in cli_options, it is used internally", i, v)
+				cclog.ComponentError(r.name, err)
+				return nil, err
+			}
+		}
+		cliOptions := make([]string, 0)
+		cliOptions = append(cliOptions, clientConfigJSON.CLIOptions...)
+
+		// Is metrics excluded globally or per client
+		isExcluded := make(map[string]bool)
+		for _, key := range clientConfigJSON.ExcludeMetrics {
+			isExcluded[key] = true
+		}
+		for _, key := range configJSON.ExcludeMetrics {
+			isExcluded[key] = true
+		}
+
+		r.config.ClientConfigs = append(
+			r.config.ClientConfigs,
+			IPMIReceiverClientConfig{
+				Protocol:         protocol,
+				Fanout:           fanout,
+				DriverType:       driverType,
+				NumHosts:         numHosts,
+				IPMIHosts:        strings.Join(ipmiHostList, ","),
+				IPMI2HostMapping: ipmi2HostMapping,
+				Username:         username,
+				Password:         password,
+				CLIOptions:       cliOptions,
+				isExcluded:       isExcluded,
+			})
+	}
+
+	if totalNumHosts == 0 {
+		err := fmt.Errorf("at least one IPMI host config is required")
+		cclog.ComponentError(r.name, err)
+		return nil, err
+	}
+
+	cclog.ComponentInfo(r.name, "monitoring", totalNumHosts, "IPMI hosts")
+	return r, nil
+}
--- a/receivers/ipmiReceiver.md
+++ b/receivers/ipmiReceiver.md
@@ -0,0 +1,48 @@
+## IPMI Receiver
+
+The IPMI Receiver uses `ipmi-sensors` from the [FreeIPMI](https://www.gnu.org/software/freeipmi/) project to read IPMI sensor readings and sensor data repository (SDR) information. The available metrics depend on the sensors provided by the hardware vendor but typically contain temperature, fan speed, voltage and power metrics.
+
+### Configuration structure
+
+```json
+{
+    "<IPMI receiver name>": {
+        "type": "ipmi",
+        "interval": "30s",
+        "fanout": 256,
+        "username": "<Username>",
+        "password": "<Password>",
+        "endpoint": "ipmi-sensors://%h-bmc",
+        "exclude_metrics": [ "fan_speed", "voltage" ],
+        "client_config": [
+            {
+                "host_list": "n[1,2-4]"
+            },
+            {
+                "host_list": "n[5-6]",
+                "driver_type": "LAN",
+                "cli_options": [ "--workaround-flags=..." ],
+                "password": "<Password 2>"
+            }
+        ]
+    }
+}
+```
+
+Global settings:
+
+- `interval`: How often the IPMI sensor metrics should be read and send to the sink (default: 30 s)
+
+Global and per IPMI device settings (per IPMI device settings overwrite the global settings):
+
+- `exclude_metrics`: list of excluded metrics e.g. fan_speed, power, temperature, utilization, voltage
+- `fanout`: Maximum number of simultaneous IPMI connections (default: 64)
+- `driver_type`: Out of band IPMI driver (default: LAN_2_0)
+- `username`: User name to authenticate with
+- `password`: Password to use for authentication
+- `endpoint`: URL of the IPMI device (placeholder `%h` gets replaced by the hostname)
+
+Per IPMI device settings:
+
+- `host_list`: List of hosts with the same client configuration
+- `cli_options`: Additional command line options for ipmi-sensors
--- a/receivers/metricReceiver.go
+++ b/receivers/metricReceiver.go
@@ -1,11 +1,14 @@
 package receivers

 import (
-	//	"time"
-	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
-	influx "github.com/influxdata/line-protocol"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
 )

+type defaultReceiverConfig struct {
+	Type string `json:"type"`
+}
+
+// Receiver configuration: Listen address, port
 type ReceiverConfig struct {
 	Addr         string `json:"address"`
 	Port         string `json:"port"`
@@ -15,42 +18,23 @@ type ReceiverConfig struct {
 }

 type receiver struct {
-	name         string
-	addr         string
-	port         string
-	database     string
-	organization string
-	sink         chan lp.CCMetric
+	name string
+	sink chan lp.CCMetric
 }

 type Receiver interface {
-	Init(config ReceiverConfig) error
 	Start()
-	Close()
-	Name() string
-	SetSink(sink chan lp.CCMetric)
+	Close()                        // Close / finish metric receiver
+	Name() string                  // Name of the metric receiver
+	SetSink(sink chan lp.CCMetric) // Set sink channel
 }

+// Name returns the name of the metric receiver
 func (r *receiver) Name() string {
 	return r.name
 }

+// SetSink set the sink channel
 func (r *receiver) SetSink(sink chan lp.CCMetric) {
 	r.sink = sink
 }
-
-func Tags2Map(metric influx.Metric) map[string]string {
-	tags := make(map[string]string)
-	for _, t := range metric.TagList() {
-		tags[t.Key] = t.Value
-	}
-	return tags
-}
-
-func Fields2Map(metric influx.Metric) map[string]interface{} {
-	fields := make(map[string]interface{})
-	for _, f := range metric.FieldList() {
-		fields[f.Key] = f.Value
-	}
-	return fields
-}
--- a/receivers/natsReceiver.go
+++ b/receivers/natsReceiver.go
@@ -1,90 +1,147 @@
 package receivers

 import (
+	"encoding/json"
 	"errors"
 	"fmt"
-	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
-	influx "github.com/influxdata/line-protocol"
-	nats "github.com/nats-io/nats.go"
-	cclog "github.com/ClusterCockpit/cc-metric-collector/internal/ccLogger"
 	"time"
+
+	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
+	influx "github.com/influxdata/line-protocol/v2/lineprotocol"
+	nats "github.com/nats-io/nats.go"
 )

 type NatsReceiverConfig struct {
-	Addr     string `json:"address"`
-	Port     string `json:"port"`
-	Database string `json:"database"`
+	Type    string `json:"type"`
+	Addr    string `json:"address"`
+	Port    string `json:"port"`
+	Subject string `json:"subject"`
 }

 type NatsReceiver struct {
 	receiver
-	nc      *nats.Conn
-	handler *influx.MetricHandler
-	parser  *influx.Parser
-	meta    map[string]string
-	config  ReceiverConfig
-}
-
-var DefaultTime = func() time.Time {
-	return time.Unix(42, 0)
-}
-
-func (r *NatsReceiver) Init(config ReceiverConfig) error {
-	r.name = "NatsReceiver"
-	r.config = config
-	if len(r.config.Addr) == 0 ||
-		len(r.config.Port) == 0 ||
-		len(r.config.Database) == 0 {
-		return errors.New("Not all configuration variables set required by NatsReceiver")
-	}
-	r.meta = map[string]string{"source": r.name}
-	r.addr = r.config.Addr
-	if len(r.addr) == 0 {
-		r.addr = nats.DefaultURL
-	}
-	r.port = r.config.Port
-	if len(r.port) == 0 {
-		r.port = "4222"
-	}
-	uri := fmt.Sprintf("%s:%s", r.addr, r.port)
-	cclog.ComponentDebug("NatsReceiver", "INIT", uri)
-	nc, err := nats.Connect(uri)
-	if err == nil {
-		r.database = r.config.Database
-		r.nc = nc
-	} else {
-		r.nc = nil
-		return err
-	}
-	r.handler = influx.NewMetricHandler()
-	r.parser = influx.NewParser(r.handler)
-	r.parser.SetTimeFunc(DefaultTime)
-	return err
+	nc     *nats.Conn
+	meta   map[string]string
+	config NatsReceiverConfig
 }

+// Start subscribes to the configured NATS subject
+// Messages wil be handled by r._NatsReceive
 func (r *NatsReceiver) Start() {
-	cclog.ComponentDebug("NatsReceiver", "START")
-	r.nc.Subscribe(r.database, r._NatsReceive)
+	cclog.ComponentDebug(r.name, "START")
+	r.nc.Subscribe(r.config.Subject, r._NatsReceive)
 }

+// _NatsReceive receives subscribed messages from the NATS server
 func (r *NatsReceiver) _NatsReceive(m *nats.Msg) {
-	metrics, err := r.parser.Parse(m.Data)
-	if err == nil {
-		for _, m := range metrics {
-			y := lp.FromInfluxMetric(m)
-			for k, v := range r.meta {
-				y.AddMeta(k, v)
+
+	d := influx.NewDecoderWithBytes(m.Data)
+	for d.Next() {
+
+		// Decode measurement name
+		measurement, err := d.Measurement()
+		if err != nil {
+			msg := "_NatsReceive: Failed to decode measurement: " + err.Error()
+			cclog.ComponentError(r.name, msg)
+			return
+		}
+
+		// Decode tags
+		tags := make(map[string]string)
+		for {
+			key, value, err := d.NextTag()
+			if err != nil {
+				msg := "_NatsReceive: Failed to decode tag: " + err.Error()
+				cclog.ComponentError(r.name, msg)
+				return
 			}
-			if r.sink != nil {
-				r.sink <- y
+			if key == nil {
+				break
 			}
+			tags[string(key)] = string(value)
+		}
+
+		// Decode fields
+		fields := make(map[string]interface{})
+		for {
+			key, value, err := d.NextField()
+			if err != nil {
+				msg := "_NatsReceive: Failed to decode field: " + err.Error()
+				cclog.ComponentError(r.name, msg)
+				return
+			}
+			if key == nil {
+				break
+			}
+			fields[string(key)] = value.Interface()
+		}
+
+		// Decode time stamp
+		t, err := d.Time(influx.Nanosecond, time.Time{})
+		if err != nil {
+			msg := "_NatsReceive: Failed to decode time: " + err.Error()
+			cclog.ComponentError(r.name, msg)
+			return
+		}
+
+		y, _ := lp.New(
+			string(measurement),
+			tags,
+			r.meta,
+			fields,
+			t,
+		)
+
+		if r.sink != nil {
+			r.sink <- y
 		}
 	}
 }

+// Close closes the connection to the NATS server
 func (r *NatsReceiver) Close() {
 	if r.nc != nil {
-		cclog.ComponentDebug("NatsReceiver", "CLOSE")
+		cclog.ComponentDebug(r.name, "CLOSE")
 		r.nc.Close()
 	}
 }
+
+// NewNatsReceiver creates a new Receiver which subscribes to messages from a NATS server
+func NewNatsReceiver(name string, config json.RawMessage) (Receiver, error) {
+	r := new(NatsReceiver)
+	r.name = fmt.Sprintf("NatsReceiver(%s)", name)
+
+	// Read configuration file, allow overwriting default config
+	r.config.Addr = "localhost"
+	r.config.Port = "4222"
+	if len(config) > 0 {
+		err := json.Unmarshal(config, &r.config)
+		if err != nil {
+			cclog.ComponentError(r.name, "Error reading config:", err.Error())
+			return nil, err
+		}
+	}
+	if len(r.config.Addr) == 0 ||
+		len(r.config.Port) == 0 ||
+		len(r.config.Subject) == 0 {
+		return nil, errors.New("not all configuration variables set required by NatsReceiver")
+	}
+
+	// Set metadata
+	r.meta = map[string]string{
+		"source": r.name,
+	}
+
+	// Connect to NATS server
+	url := fmt.Sprintf("nats://%s:%s", r.config.Addr, r.config.Port)
+	cclog.ComponentDebug(r.name, "NewNatsReceiver", url, "Subject", r.config.Subject)
+	if nc, err := nats.Connect(url); err == nil {
+		r.nc = nc
+	} else {
+		r.nc = nil
+		return nil, err
+	}
+
+	return r, nil
+}
--- a/receivers/natsReceiver.md
+++ b/receivers/natsReceiver.md
@@ -0,0 +1,50 @@
+## `nats` receiver
+
+The `nats` receiver can be used receive metrics from the NATS network. The `nats` receiver subscribes to the topic `database` and listens on `address` and `port` for metrics in the InfluxDB line protocol.
+
+### Configuration structure
+
+```json
+{
+  "<name>": {
+    "type": "nats",
+    "address" : "nats-server.example.org",
+    "port" : "4222",
+    "subject" : "subject"
+  }
+}
+```
+
+- `type`: makes the receiver a `nats` receiver
+- `address`: Address of the NATS control server
+- `port`: Port of the NATS control server
+- `subject`: Subscribes to this subject and receive metrics
+
+### Debugging
+
+- Install NATS server and command line client
+- Start NATS server
+
+  ```bash
+  nats-server --net nats-server.example.org --port 4222
+  ```
+
+- Check NATS server works as expected
+
+  ```bash
+  nats --server=nats-server-db.example.org:4222 server check
+  ```
+
+- Use NATS command line client to subscribe to all messages
+
+  ```bash
+  nats --server=nats-server-db.example.org:4222 sub ">"
+  ```
+
+- Use NATS command line client to send message to NATS receiver
+
+  ```bash
+  nats --server=nats-server-db.example.org:4222 pub subject \
+  "myMetric,hostname=myHost,type=hwthread,type-id=0,unit=Hz value=400000i 1694777161164284635
+  myMetric,hostname=myHost,type=hwthread,type-id=1,unit=Hz value=400001i 1694777161164284635"
+  ```
--- a/receivers/prometheusReceiver.go
+++ b/receivers/prometheusReceiver.go
@@ -0,0 +1,122 @@
+package receivers
+
+import (
+	"bufio"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"log"
+	"net/http"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+
+	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
+	lp "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric"
+)
+
+type PrometheusReceiverConfig struct {
+	defaultReceiverConfig
+	Addr     string `json:"address"`
+	Port     string `json:"port"`
+	Path     string `json:"path"`
+	Interval string `json:"interval"`
+	SSL      bool   `json:"ssl"`
+}
+
+type PrometheusReceiver struct {
+	receiver
+	meta     map[string]string
+	config   PrometheusReceiverConfig
+	interval time.Duration
+	done     chan bool
+	wg       sync.WaitGroup
+	ticker   *time.Ticker
+	uri      string
+}
+
+func (r *PrometheusReceiver) Start() {
+	cclog.ComponentDebug(r.name, "START", r.uri)
+	r.wg.Add(1)
+
+	r.ticker = time.NewTicker(r.interval)
+	go func() {
+		for {
+			select {
+			case <-r.done:
+				r.wg.Done()
+				return
+			case t := <-r.ticker.C:
+				resp, err := http.Get(r.uri)
+				if err != nil {
+					log.Fatal(err)
+				}
+				defer resp.Body.Close()
+
+				scanner := bufio.NewScanner(resp.Body)
+				for scanner.Scan() {
+					line := scanner.Text()
+					if strings.HasPrefix(line, "#") {
+						continue
+					}
+					lineSplit := strings.Fields(line)
+					// separate metric name from tags (labels in Prometheus)
+					tags := map[string]string{}
+					name := lineSplit[0]
+					if sindex := strings.Index(name, "{"); sindex >= 0 {
+						eindex := strings.Index(name, "}")
+						for _, kv := range strings.Split(name[sindex+1:eindex], ",") {
+							eq := strings.Index(kv, "=")
+							tags[kv[0:eq]] = strings.Trim(kv[eq+1:], "\"")
+						}
+						name = lineSplit[0][0:sindex]
+					}
+					value, err := strconv.ParseFloat(lineSplit[1], 64)
+					if err == nil {
+						y, err := lp.New(name, tags, r.meta, map[string]interface{}{"value": value}, t)
+						if err == nil {
+							r.sink <- y
+						}
+					}
+				}
+			}
+		}
+	}()
+}
+
+func (r *PrometheusReceiver) Close() {
+	cclog.ComponentDebug(r.name, "CLOSE")
+	r.done <- true
+	r.wg.Wait()
+}
+
+func NewPrometheusReceiver(name string, config json.RawMessage) (Receiver, error) {
+	r := new(PrometheusReceiver)
+	r.name = fmt.Sprintf("PrometheusReceiver(%s)", name)
+	if len(config) > 0 {
+		err := json.Unmarshal(config, &r.config)
+		if err != nil {
+			cclog.ComponentError(r.name, "Error reading config:", err.Error())
+			return nil, err
+		}
+	}
+	if len(r.config.Addr) == 0 ||
+		len(r.config.Port) == 0 ||
+		len(r.config.Interval) == 0 {
+		return nil, errors.New("not all configuration variables set required by PrometheusReceiver (address and port)")
+	}
+	if len(r.config.Interval) > 0 {
+		t, err := time.ParseDuration(r.config.Interval)
+		if err == nil {
+			r.interval = t
+		}
+	}
+	r.meta = map[string]string{"source": r.name}
+	proto := "http"
+	if r.config.SSL {
+		proto = "https"
+	}
+	r.uri = fmt.Sprintf("%s://%s:%s/%s", proto, r.config.Addr, r.config.Port, r.config.Path)
+	return r, nil
+}
--- a/Show More
+++ b/Show More