Sync with upstream

.github/workflows/build.yml

@@ -2,13 +2,18 @@ name: build redfish exporter package
 
 on: 
   issue_comment:
-    types: [edited,created]
+    types:
+    - edited
+    - created
+  pull_request:
+    branches:
+    - master
 
 jobs:
   centos-7:
     name: on centos 7
     runs-on: ubuntu-20.04
-    if: github.event.comment.body == 'build on centos 7' 
+    if: github.event.comment.body == 'build on centos 7'  || github.event.pull_request.opened || github.event.pull_request.reopened
     steps:
       - name: Checkout source code
         uses: actions/checkout@v2
@@ -25,7 +30,7 @@ jobs:
   centos-8:
     name: on centos 8
     runs-on: ubuntu-20.04
-    if: github.event.comment.body == 'build on centos 8' 
+    if: github.event.comment.body == 'build on centos 8' || github.event.pull_request.opened || github.event.pull_request.reopened
     steps:
       - name: Checkout source code
         uses: actions/checkout@v2
@@ -38,4 +43,4 @@ jobs:
       - name: Install dependencies
         run: sudo apt-get install -y make curl podman
       - name: build package
-        run: make docker-build-centos8
+        run: make docker-build-centos8

.gitignore

@@ -20,3 +20,13 @@ redfish_exporter
 
 # Editor backup files
 *~
+
+# config file
+config.yml
+
+# IDE files
+.vscode
+
+# Commit all Helm chart files
+!helm/**
+helm/*.lock

Changelog

@@ -0,0 +1,18 @@
+0.11.0
+
+1. add manager metrics
+2. fix none objects error
+3. improve the log processing and handling, thanks for @mjavier2k  
+4. other misc fixes 
+
+
+
+0.10.1
+
+1. update rpm spec
+
+0.10.0 
+
+This is initial release, implemented following metrics
+- chassis metircs
+- system metrics

Dockerfile

@@ -0,0 +1,25 @@
+FROM golang:rc-bullseye AS builder
+
+LABEL maintainer="Jennings Liu <jenningsloy318@gmail.com>"
+
+ARG ARCH=amd64
+
+ENV GOROOT /usr/local/go
+ENV GOPATH /go
+ENV PATH "$GOROOT/bin:$GOPATH/bin:$PATH"
+ENV GO_VERSION 1.15.2
+ENV GO111MODULE=on 
+
+
+# Build dependencies
+RUN mkdir -p /go/src/github.com/ && \
+    git clone https://github.com/jenningsloy318/redfish_exporter /go/src/github.com/jenningsloy318/redfish_exporter && \
+    cd /go/src/github.com/jenningsloy318/redfish_exporter && \
+    make build
+
+FROM golang:rc-bullseye
+
+COPY --from=builder /go/src/github.com/jenningsloy318/redfish_exporter/build/redfish_exporter /usr/local/bin/redfish_exporter
+RUN mkdir /etc/prometheus
+COPY config.yml.example /etc/prometheus/redfish_exporter.yml
+CMD ["/usr/local/bin/redfish_exporter","--config.file","/etc/prometheus/redfish_exporter.yml"]

Dockerfile.Alpine-builder

@@ -0,0 +1,26 @@
+FROM golang:1.18.1-alpine3.15 AS builder
+
+LABEL maintainer="Jennings Liu <jenningsloy318@gmail.com>"
+
+ARG ARCH=amd64
+
+ENV GOROOT /usr/local/go
+ENV GOPATH /go
+ENV PATH "$GOROOT/bin:$GOPATH/bin:$PATH"
+ENV GO_VERSION 1.18.1
+ENV GO111MODULE=on
+ENV CGO_ENABLED=0
+
+# Build dependencies
+WORKDIR /go/src/
+COPY . .
+RUN apk update && apk add make git
+RUN make build
+
+# Second stage
+FROM alpine:3.15
+
+COPY --from=builder /go/src/build/redfish_exporter /usr/local/bin/redfish_exporter
+RUN mkdir /etc/prometheus
+COPY config.yml.example /etc/prometheus/redfish_exporter.yml
+CMD ["/usr/local/bin/redfish_exporter","--config.file","/etc/prometheus/redfish_exporter.yml"]

Dockerfile.Centos7-builder

@@ -7,13 +7,13 @@ ARG ARCH=amd64
 ENV GOROOT /usr/local/go
 ENV GOPATH /go
 ENV PATH "$GOROOT/bin:$GOPATH/bin:$PATH"
-ENV GO_VERSION 1.14.2
+ENV GO_VERSION 1.15.2
 ENV GO111MODULE=on 
 ENV GOPROXY=https://goproxy.cn
 
 
 # Build dependencies
 
-RUN yum install -y  rpm-build make  git && \
-
+RUN yum update -y && \
+    yum install -y  rpm-build make  git && \
     curl -SL https://dl.google.com/go/go${GO_VERSION}.linux-${ARCH}.tar.gz | tar -xzC /usr/local

Dockerfile.Centos8-builder

@@ -7,13 +7,13 @@ ARG ARCH=amd64
 ENV GOROOT /usr/local/go
 ENV GOPATH /go
 ENV PATH "$GOROOT/bin:$GOPATH/bin:$PATH"
-ENV GO_VERSION 1.14.2
+ENV GO_VERSION 1.15.2
 ENV GO111MODULE=on 
 ENV GOPROXY=https://goproxy.cn
 
 
 # Build dependencies
 
-RUN yum install -y  rpm-build make  git && \
-
+RUN yum update -y && \
+    yum install -y  rpm-build make  git && \
     curl -SL https://dl.google.com/go/go${GO_VERSION}.linux-${ARCH}.tar.gz | tar -xzC /usr/local

Makefile

@@ -11,12 +11,11 @@ VERSION ?= $(shell cat VERSION)
 REVERSION ?=$(shell git log -1 --pretty="%H")
 BRANCH ?=$(shell git rev-parse --abbrev-ref HEAD)
 TIME ?=$(shell date --rfc-3339=seconds)
-HOST ?=$(shell hostname)  
 DOCKER := $(shell { command -v podman || command -v docker; } 2>/dev/null)
 
 
-all:  fmt style  build  docker-build rpm  docker-rpm
- 
+all:  fmt style build docker-build docker-rpm
+
 style:
 	@echo ">> checking code style"
 	! $(GOFMT) -d $$(find . -path ./vendor -prune -o -name '*.go' -print) | grep '^'
@@ -31,30 +30,40 @@ check_license:
                exit 1; \
        fi
 
-build: | 
+build: |
 	@echo ">> building binaries"
-	$(GO) build -o build/redfish_exporter -ldflags  '-X "main.Version=$(VERSION)" -X  "main.BuildRevision=$(REVERSION)" -X  "main.BuildBranch=$(BRANCH)" -X "main.BuildTime=$(TIME)" -X "main.BuildHost=$(HOSTNAME)"'
+	$(GO) build -o build/redfish_exporter -ldflags  '-X "main.Version=$(VERSION)" -X  "main.BuildRevision=$(REVERSION)" -X  "main.BuildBranch=$(BRANCH)" -X "main.BuildTime=$(TIME)"'
 
 docker-build-centos7:
-	$(DOCKER) run -v `pwd`:/go/src/github.com/jenningsloy318/redfish_exporter  -w /go/src/github.com/jenningsloy318/redfish_exporter docker.io/jenningsloy318/prom-builder:centos7  make build
+	$(DOCKER) run -v `pwd`:/go/src/github.com/jenningsloy318/redfish_exporter  -w /go/src/github.com/jenningsloy318/redfish_exporter docker.io/jenningsloy318/prom-builder:centos7  /bin/bash -c "yum update -y && make build"
 
 
 docker-build-centos8:
-	$(DOCKER) run -v `pwd`:/go/src/github.com/jenningsloy318/redfish_exporter  -w /go/src/github.com/jenningsloy318/redfish_exporter docker.io/jenningsloy318/prom-builder:centos8  make build
+	$(DOCKER) run -v `pwd`:/go/src/github.com/jenningsloy318/redfish_exporter  -w /go/src/github.com/jenningsloy318/redfish_exporter docker.io/jenningsloy318/prom-builder:centos8  /bin/bash -c "yum update -y && make build"
+
+docker-build:
+	make docker-build-centos7
+	make docker-build-centos8
 
 rpm: | build
 	@echo ">> building binaries"
 	$(RPM)
 
-docker-rpm:
-	$(DOCKER) run -v `pwd`:/go/src/github.com/jenningsloy318/redfish_exporter  -w /go/src/github.com/jenningsloy318/redfish_exporter docker.io/jenningsloy318/prom-builder  make rpm
+docker-rpm-centos7:
+	$(DOCKER) run -v `pwd`:/go/src/github.com/jenningsloy318/redfish_exporter  -w /go/src/github.com/jenningsloy318/redfish_exporter docker.io/jenningsloy318/prom-builder:centos7  /bin/bash -c "yum update -y && make rpm"
 
+docker-rpm-centos8:
+	$(DOCKER) run -v `pwd`:/go/src/github.com/jenningsloy318/redfish_exporter  -w /go/src/github.com/jenningsloy318/redfish_exporter docker.io/jenningsloy318/prom-builder:centos8  /bin/bash -c "yum update -y && make rpm"
+
+docker-rpm:
+	make docker-rpm-centos7
+	make docker-rpm-centos8
 
 fmt:
 	@echo ">> format code style"
-	$(GOFMT) -w $$(find . -path ./vendor -prune -o -name '*.go' -print) 
+	$(GOFMT) -w $$(find . -path ./vendor -prune -o -name '*.go' -print)
 
 clean:
 	rm -rf $(BIN_DIR)
 
-.PHONY: all style check_license format build test fmt  build docker-build   rpm docker-rpm
+.PHONY: all style check_license fmt build fmt build rpm docker-build docker-rpm

README.md

@@ -12,8 +12,12 @@ hosts:
   default:
     username: admin
     password: pass
+groups:
+  group1:
+    username: group1_user
+    password: group1_pass
 ```
-Note that the ```default`` entry is useful as it avoids an error
+Note that the ```default``` entry is useful as it avoids an error
 condition that is discussed in [this issue][2].
 
 ## Building
@@ -32,19 +36,19 @@ or build in centos 8 docker image
 ```sh
 make docker-build-centos8
 ```
+or we can also build a docker image  using [Dockerfile](./Dockerfile)
 
 ## Running
-
-To run redfish_exporter do something like:
-```sh
-redfish_exporter --config.file=redfish_exporter.yml
-```
-and run
-```sh
-redfish_exporter -h
-```
-for more options.
-
+- running directly on linux
+  ```sh
+  redfish_exporter --config.file=redfish_exporter.yml
+  ```
+  and run   `redfish_exporter -h
+  `  for more options.
+
+- running in container
+
+  Also if you build it as a docker image, you can also run in container, just remember to replace your config  `/etc/prometheus/redfish_exporter.yml` in container
 ## Scraping
 
 We can get the metrics via
@@ -54,7 +58,17 @@ curl http://<redfish_exporter host>:9610/redfish?target=10.36.48.24
 ```
 or by pointing your favourite browser at this URL.
 
-## prometheus configuration
+## Reloading Configuration
+```
+PUT /-/reload
+POST /-/reload
+```
+The `/-/reload` endpoint triggers a reload of the redfish_exporter configuration.
+500 will be returned when the reload fails.
+
+Alternatively, a configuration reload can be triggered by sending `SIGHUP` to the redfish_exporter process as well.
+
+## Prometheus Configuration
 
 You can then setup [Prometheus][3] to scrape the target using
 something like this in your Prometheus configuration files:
@@ -68,19 +82,26 @@ something like this in your Prometheus configuration files:
 
     static_configs:
     - targets:
-       - 10.36.48.24
+       - 10.36.48.24 ## here is the list of the redfish targets which will be monitored
     relabel_configs:
       - source_labels: [__address__]
         target_label: __param_target
       - source_labels: [__param_target]
         target_label: instance
       - target_label: __address__
-        replacement: localhost:9610  ### the address of the redfish-exporter address
+        replacement: localhost:9610  ### the address of the redfish-exporter address, hence relpace localhost with the server IP address that redfish-export is running on
+      # (optional) when using group config add this to have group=my_group_name
+      - target_label: __param_group
+        replacement: my_group_name
 ```
 Note that port 9610 has been [reserved][4] for the redfish_exporter.
 ## Supported Devices (tested)
+- Enginetech EG520R-G20 (Supermicro Firmware Revision 1.76.39)
+- Enginetech EG920A-G20 (Huawei iBMC 6.22)
 - Lenovo ThinkSystem SR850 (BMC 2.1/2.42)
 - Lenovo ThinkSystem SR650 (BMC 2.50)
+- Dell PowerEdge R440, R640, R650, R6515, C6420
+- GIGABYTE G292-Z20, G292-Z40, G482-Z54
 
 ## Acknowledgement
 

VERSION

@@ -1 +1 @@
-0.10.1
+0.11.0