From df7435b2596b77fbfc2fe161329946fe8e41e405 Mon Sep 17 00:00:00 2001 From: Kyle Date: Mon, 21 Mar 2022 13:56:19 -0700 Subject: [PATCH] add DAEMON_OLD_VERSION health check, update readme, remove makefile --- Makefile | 17 ------- Makefile.COMMON | 132 ------------------------------------------------ README.md | 10 ++-- ceph/health.go | 11 +++- 4 files changed, 17 insertions(+), 153 deletions(-) delete mode 100644 Makefile delete mode 100644 Makefile.COMMON diff --git a/Makefile b/Makefile deleted file mode 100644 index bfdb9d4..0000000 --- a/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 2015 The Prometheus Authors -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -VERSION := 0.1.0 -TARGET := ceph_exporter - -include Makefile.COMMON diff --git a/Makefile.COMMON b/Makefile.COMMON deleted file mode 100644 index 9198cf9..0000000 --- a/Makefile.COMMON +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 2015 The Prometheus Authors -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# THE AUTHORITATIVE VERSION OF THIS MAKEFILE LIVES IN: -# -# https://github.com/prometheus/utils -# -# PLEASE MAKE ANY CHANGES THERE AND PROPAGATE THEM TO ALL PROMETHEUS -# REPOSITORIES THAT ARE USING THIS MAKEFILE. -# -# This file provides common Makefile infrastructure for several Prometheus -# components. This includes make tasks for downloading Go, setting up a -# self-contained build environment, fetching Go dependencies, building -# binaries, running tests, and doing release management. This file is intended -# to be included from a project's Makefile, which needs to define the following -# variables, at a minimum: -# -# * VERSION - The current version of the project in question. -# * TARGET - The desired name of the built binary. -# -# Many of the variables defined below are defined conditionally (using '?'), -# which allows the project's main Makefile to override any of these settings, if -# needed. See also: -# -# https://www.gnu.org/software/make/manual/html_node/Flavors.html#Flavors. -# -# The including Makefile may define any number of extra targets that are -# specific to that project. - -VERSION ?= $(error VERSION not set in including Makefile) -TARGET ?= $(error TARGET not set in including Makefile) - -SRC ?= $(shell find . -type f -name "*.go" ! -path "./.build/*") -GOOS ?= $(shell uname | tr A-Z a-z) -GOARCH ?= $(subst x86_64,amd64,$(patsubst i%86,386,$(shell uname -m))) - -GO_VERSION ?= 1.13 - -# Check for the correct version of go in the path. If we find it, use it. -# Otherwise, prepare to build go locally. -ifeq ($(shell command -v "go" >/dev/null && go version | sed -e 's/^[^0-9.]*\([0-9.]*\).*/\1/'), $(GO_VERSION)) - GOCC ?= $(shell command -v "go") - GOFMT ?= $(shell command -v "gofmt") - GO ?= $(GOCC) -else - GOURL ?= https://golang.org/dl - GOPKG ?= go$(GO_VERSION).$(GOOS)-$(GOARCH).tar.gz - GOROOT ?= $(CURDIR)/.build/go$(GO_VERSION) - GOCC ?= $(GOROOT)/bin/go - GOFMT ?= $(GOROOT)/bin/gofmt - GO ?= GOROOT=$(GOROOT) $(GOCC) -endif - -# Use vendored dependencies if available. Otherwise try to download them. -ifneq (,$(wildcard vendor)) - DEPENDENCIES := $(shell find vendor/ -type f -iname '*.go') - GO := GO15VENDOREXPERIMENT=1 $(GO) -else - GOPATH := $(CURDIR)/.build/gopath - ROOTPKG ?= github.com/prometheus/$(TARGET) - SELFLINK ?= $(GOPATH)/src/$(ROOTPKG) - DEPENDENCIES := dependencies-stamp - GO := GOPATH=$(GOPATH) $(GO) -endif - -# Never honor GOBIN, should it be set at all. -unexport GOBIN - -SUFFIX ?= $(GOOS)-$(GOARCH) -BINARY ?= $(TARGET) -ARCHIVE ?= $(TARGET)-$(VERSION).$(SUFFIX).tar.gz - -default: $(BINARY) - -$(BINARY): $(GOCC) $(SRC) $(DEPENDENCIES) Makefile Makefile.COMMON - $(GO) build $(GOFLAGS) -o $@ - -.PHONY: archive -archive: $(ARCHIVE) - -$(ARCHIVE): $(BINARY) - tar -czf $@ $< - -.PHONY: tag -tag: - git tag $(VERSION) - git push --tags - -.PHONY: test -test: $(GOCC) $(DEPENDENCIES) - $(GO) test $$($(GO) list ./... | grep -v /vendor/) - -.PHONY: format -format: $(GOCC) - find . -iname '*.go' | egrep -v "^\./\.build|./generated|\./vendor|\.(l|y)\.go" | xargs -n1 $(GOFMT) -w -s=true - -.PHONY: clean -clean: - rm -rf $(BINARY) $(ARCHIVE) .build *-stamp - - - -$(GOCC): - @echo Go version $(GO_VERSION) required but not found in PATH. - @echo About to download and install go$(GO_VERSION) to $(GOROOT) - @echo Abort now if you want to manually install it system-wide instead. - @echo - @sleep 5 - mkdir -p .build - # The archive contains a single directory called 'go/'. - curl -L $(GOURL)/$(GOPKG) | tar -C .build -xzf - - rm -rf $(GOROOT) - mv .build/go $(GOROOT) - -$(SELFLINK): - mkdir -p $(dir $@) - ln -s $(CURDIR) $@ - -# Download dependencies if project doesn't vendor them. -dependencies-stamp: $(GOCC) $(SRC) | $(SELFLINK) - $(GO) get -d - touch $@ diff --git a/README.md b/README.md index 918db92..49ef976 100644 --- a/README.md +++ b/README.md @@ -49,13 +49,17 @@ Name | Description | Default ## Installation -Typical way of installing in Go should work. +The typical Go way of installing or building should work provided you have the [cgo dependencies](https://github.com/ceph/go-ceph#installation). ``` -$ go install +$ go install -tags nautilus ``` -A Makefile is provided in case you find a need for it. +``` +$ go build -o ceph_exporter -tags nautilus +``` + +We build the client with support for nautilus specifically but the binary will work for Octopus and Pacific as well. ## Docker Image diff --git a/ceph/health.go b/ceph/health.go index 44f79d7..173ca16 100644 --- a/ceph/health.go +++ b/ceph/health.go @@ -278,7 +278,7 @@ func NewClusterHealthCollector(exporter *Exporter) *ClusterHealthCollector { labels := make(prometheus.Labels) labels["cluster"] = exporter.Cluster - return &ClusterHealthCollector{ + collector := &ClusterHealthCollector{ conn: exporter.Conn, logger: exporter.Logger, version: exporter.Version, @@ -898,6 +898,15 @@ func NewClusterHealthCollector(exporter *Exporter) *ClusterHealthCollector { labels, ), } + + if exporter.Version.IsAtLeast(Pacific) { + // pacific adds the DAEMON_OLD_VERSION health check + // that indicates that multiple versions of Ceph have been running for longer than mon_warn_older_version_delay + // we'll interpret this is a critical warning (2) + collector.healthChecksMap["DAEMON_OLD_VERSION"] = 2 + } + + return collector } func (c *ClusterHealthCollector) metricsList() []prometheus.Metric {