Update to use v0.10.0 as release.

Fix problem with update_p4prom.sh not checking for p4metrics.yaml

Author: rcowham

README.md

@@ -150,13 +150,18 @@ Note these metrics will all have these labels: sdpinst (if SDP), serverid. Extra
 | p4_error_count | subsystem, error_id, level | (Deprecated - monitor_metrics.sh) Server errors by id - for sudden spurts of errors |
 | p4_errors_count | subsys, severity | Server errors by subsystem and severiy (e.g. error/fatal) - for sudden spurts of errors |
 | p4_filesys_min | filesys | Value of P4D configurable filesys.*.min |
+| p4_journal_size | | Size of P4JOURNAL in bytes |
+| p4_journals_rotated | | Count of rotations of P4JOURNAL by p4metrics |
 | p4_license_expires |  | P4D License expiry (epoch secs) |
 | p4_license_info | info | P4D License info (if present) |
 | p4_license_IP | IP | P4D License IP address (if present) |
 | p4_license_support_expires |  | P4D License support expiry (epoch secs) |
 | p4_license_time_remaining |  | P4D License time remaining (secs) |
 | p4_licensed_user_count |  | P4D Licensed User count |
 | p4_licensed_user_limit |  | P4D Licensed User Limit |
+| p4_log_size | | Size of P4LOG in bytes |
+| p4_logs_file_count| | Count of files in SDP logs directory (not created for non-SDP) |
+| p4_logs_rotated | | Count of rotations of P4LOG by p4metrics |
 | p4_monitor_by_cmd | cmd | P4 running processes - counted by cmd |
 | p4_monitor_by_state | state | P4 running processes - counted by state (see 'p4 monitor show' status field) |
 | p4_monitor_by_user | user | P4 running processes - counted by user |

cmd/p4metrics/p4metrics.go

@@ -941,7 +941,7 @@ func (p4m *P4MonitorMetrics) monitorJournalAndLogs() {
 			p4m.logger.Debugf("journal volume - size %d, free space %d", jstat.Size(), jvol.Free)
 			if float64(jstat.Size())*1.1 < float64(pvol.Free) {
 				if p4m.config.MaxJournalSizeInt > 0 && jstat.Size() > p4m.config.MaxJournalSizeInt {
-					p4m.logger.Debugf("journal volume will rotate - size %d, max %d", jstat.Size(), p4m.config.MaxJournalSizeInt)
+					p4m.logger.Debugf("journal will be rotated - size %d, max %d", jstat.Size(), p4m.config.MaxJournalSizeInt)
 					rotateJournal = true
 				}
 			} else {
@@ -951,7 +951,7 @@ func (p4m *P4MonitorMetrics) monitorJournalAndLogs() {
 			if !rotateJournal && p4m.config.MaxJournalPercentInt > 0 {
 				percentSize := float64(jvol.Total) * float64(p4m.config.MaxJournalPercentInt) / float64(100.0)
 				if float64(jstat.Size()) > percentSize {
-					p4m.logger.Debugf("journal volume will rotate - size %d, max percent %d, val %.0f", jstat.Size(), p4m.config.MaxJournalPercentInt, percentSize)
+					p4m.logger.Debugf("journal will be rotated - size %d, max percent %d, val %.0f", jstat.Size(), p4m.config.MaxJournalPercentInt, percentSize)
 					rotateJournal = true
 				}
 			}
@@ -987,13 +987,13 @@ func (p4m *P4MonitorMetrics) monitorJournalAndLogs() {
 	if ok3 {
 		p4m.logger.Debugf("log volume - size %d, free space %d", lstat.Size(), lvol.Free)
 		if p4m.config.MaxLogSizeInt > 0 && lstat.Size() > p4m.config.MaxLogSizeInt {
-			p4m.logger.Debugf("log will be rotate - size %d, max %d", lstat.Size(), p4m.config.MaxLogSizeInt)
+			p4m.logger.Debugf("log will be rotated - size %d, max %d", lstat.Size(), p4m.config.MaxLogSizeInt)
 			rotateLog = true
 		}
 		if !rotateLog && p4m.config.MaxLogPercentInt > 0 {
 			percentSize := float64(lvol.Total) * float64(p4m.config.MaxLogPercentInt) / float64(100.0)
 			if float64(lstat.Size()) > percentSize {
-				p4m.logger.Debugf("log will rotate - size %d, max percent %d, val %.0f", lstat.Size(), p4m.config.MaxLogPercentInt, percentSize)
+				p4m.logger.Debugf("log will be rotated - size %d, max percent %d, val %.0f", lstat.Size(), p4m.config.MaxLogPercentInt, percentSize)
 				rotateLog = true
 			}
 		}

scripts/install_p4prom.sh

@@ -21,7 +21,7 @@ metrics_link=/p4/metrics
 local_bin_dir=/usr/local/bin
 
 VER_NODE_EXPORTER="1.3.1"
-VER_P4PROMETHEUS="0.9.8"
+VER_P4PROMETHEUS="0.10.0"
 
 # Default to amd but allow arm architecture
 arch="amd64"

scripts/update_p4prom.sh

@@ -19,7 +19,7 @@ metrics_link=/p4/metrics
 local_bin_dir=/usr/local/bin
 
 VER_NODE_EXPORTER="1.3.1"
-VER_P4PROMETHEUS="0.9.8"
+VER_P4PROMETHEUS="0.10.0"
 
 # Default to amd but allow arm architecture
 arch="amd64"
@@ -152,6 +152,9 @@ fi
 p4prom_config_file="$p4prom_config_dir/p4prometheus.yaml"
 p4metrics_config_file="$p4prom_config_dir/p4metrics.yaml"
 
+[[ -f "$p4prom_config_file" ]] || bail "Config file '$p4prom_config_file' does not exist - please run install_p4prom.sh instead of this script!"
+[[ -f "$p4metrics_config_file" ]] || bail "Config file '$p4metrics_config_file' does not exist - please run install_p4prom.sh instead of this script!"
+
 download_and_untar () {
     fname=$1
     url=$2