Skip to content

Commit

Permalink
Changed performance data to print space separated list
Browse files Browse the repository at this point in the history
  • Loading branch information
megabreit committed Nov 8, 2019
1 parent b719d7f commit 8eac4d0
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 23 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
check_cpu_pools
check_ent_pools
check_entitlement
10 changes: 5 additions & 5 deletions INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ The binaries do not need root permission, all run fine with any unprivileged use

Binaries
========
The included binaries were built on AIX 5.3 TL12 with xlC 8.0.0.26 and were tested
on AIX 5.3 TL12, AIX 6.1 and AIX 7.1. They are included for convenience, but there
The included binaries were built on AIX 6.1 TL9 with xlC 12.1.0.21 and were tested
on AIX 6.1, AIX 7.1 and AIX 7.2. They are included for convenience, but there
is no guarantee that they work on all AIX systems.
To compile own binaries please do a "make clean; make"!
To compile your own binaries please do a "make clean; make"!

Tested compilers
================
Expand All @@ -39,7 +39,7 @@ gcc 4.8.2 (from perzl.org) was tested on AIX 5.3 TL12, 6.1 TL7 and 7.1 TL2.

Operating systems
=================
The monitors will compile and run on AIX 5.3 TL6 or higher, AIX 6.1 and AIX 7.1
The monitors will compile and run on AIX 5.3 TL6 or higher, AIX 6.1, AIX 7.1 and AIX 7.2
The perfstat pool API is not present in earlier versions and there are also hardware
dependencies (see below).

Expand All @@ -49,7 +49,7 @@ The monitor can be compiled on any AIX hardware which runs a supported AIX versi
It might be possible, that the monitor won't run because of PowerVM restrictions
or LPAR settings. See README for details

The monitor will run on Power5 or newer CPUs (tested on Power6 and 7).
The monitor will run on Power5 or newer CPUs (tested on Power6, 7 and 8).

2 types of LPARs are supported:
- shared processor LPAR
Expand Down
6 changes: 3 additions & 3 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ See command line option --help for details about all options!
LPAR prerequisites
==================

The monitor runs on Power5/6/7 hardware with shared processor LPARs or
The monitor runs on Power5/6/7/8/9 hardware with shared processor LPARs or
dedicated donating LPARs.

$ lparstat -i|grep -E "Type|Mode"
Expand Down Expand Up @@ -158,8 +158,8 @@ Example for check_ent_pools:

ENT_POOLS OK ent_used=0.43(OK) ent=0.50 ent_max=2 vcpu_busy=21.45%(OK) pool_id=11 pool_size=9 \
pool_used=1.28(OK) pool_free=7.71(OK) syspool_size=16 syspool_used=3.47(OK) syspool_free=12.53(OK) \
|ent_used=0.43;ent=0.50;ent_max=2;vcpu_busy=21.45;pool_id=11;pool_size=9;pool_used=1.28;pool_free=7.71;\
syspool_size=16;syspool_used=3.47;syspool_free=12.53
|ent_used=0.43 ent=0.50 ent_max=2 vcpu_busy=21.45 pool_id=11 pool_size=9 pool_used=1.28 pool_free=7.71 \
syspool_size=16 syspool_used=3.47 syspool_free=12.53

ent_used : used entitlement of the LPAR
ent : Entitled capacity of LPAR (lparstat -i|grep "Entitled Capacity" )
Expand Down
10 changes: 5 additions & 5 deletions check_cpu_pools.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
*/
const char *progname = "check_cpu_pools";
const char *program_name = "check_cpu_pools";
const char *copyright = "2014";
const char *email = "armink.nagios@gmail.com";
const char *name = "Armin K";
const char *version = "1.2";
const char *copyright = "2014,2019";
const char *email = "megabreit@googlemail.com";
const char *name = "Armin Kunaschik";
const char *version = "1.3";

#include <macros.h>
#include <string.h>
Expand Down Expand Up @@ -926,7 +926,7 @@ int main(int argc, char* argv[])

}

printf("CPU_POOLS %s pool_id=%d pool_size=%d pool_used=%.2f(%s) pool_free=%.2f(%s) syspool_size=%llu syspool_used=%.2f(%s) syspool_free=%.2f(%s) |pool_id=%d;pool_size=%d;pool_used=%.2f;pool_free=%.2f;syspool_size=%llu;syspool_used=%.2f;syspool_free=%.2f\n",
printf("CPU_POOLS %s pool_id=%d pool_size=%d pool_used=%.2f(%s) pool_free=%.2f(%s) syspool_size=%llu syspool_used=%.2f(%s) syspool_free=%.2f(%s) |pool_id=%d pool_size=%d pool_used=%.2f pool_free=%.2f syspool_size=%llu syspool_used=%.2f syspool_free=%.2f\n",
states[ent_pool_state],
pool_id,
phys_cpus_pool,
Expand Down
10 changes: 5 additions & 5 deletions check_ent_pools.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
*/
const char *progname = "check_ent_pools";
const char *program_name = "check_ent_pools";
const char *copyright = "2014";
const char *email = "armink.nagios@gmail.com";
const char *name = "Armin K";
const char *version = "1.2";
const char *copyright = "2014,2019";
const char *email = "megabreit@googlemail.com";
const char *name = "Armin Kunaschik";
const char *version = "1.3";

#include <macros.h>
#include <string.h>
Expand Down Expand Up @@ -1155,7 +1155,7 @@ int main(int argc, char* argv[])

}

printf("ENT_POOLS %s ent_used=%.2f(%s) ent=%.2f ent_max=%d vcpu_busy=%.2f%%(%s) pool_id=%d pool_size=%d pool_used=%.2f(%s) pool_free=%.2f(%s) syspool_size=%llu syspool_used=%.2f(%s) syspool_free=%.2f(%s) |ent_used=%.2f;ent=%.2f;ent_max=%d;vcpu_busy=%.2f;pool_id=%d;pool_size=%d;pool_used=%.2f;pool_free=%.2f;syspool_size=%llu;syspool_used=%.2f;syspool_free=%.2f\n",
printf("ENT_POOLS %s ent_used=%.2f(%s) ent=%.2f ent_max=%d vcpu_busy=%.2f%%(%s) pool_id=%d pool_size=%d pool_used=%.2f(%s) pool_free=%.2f(%s) syspool_size=%llu syspool_used=%.2f(%s) syspool_free=%.2f(%s) |ent_used=%.2f ent=%.2f ent_max=%d vcpu_busy=%.2f pool_id=%d pool_size=%d pool_used=%.2f pool_free=%.2f syspool_size=%llu syspool_used=%.2f syspool_free=%.2f\n",
states[ent_pool_state],
phys_proc_consumed,
states[ent_state],
Expand Down
10 changes: 5 additions & 5 deletions check_entitlement.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
*/
const char *progname = "check_entitlement";
const char *program_name = "check_entitlement";
const char *copyright = "2014";
const char *email = "armink.nagios@gmail.com";
const char *name = "Armin K";
const char *version = "1.2";
const char *copyright = "2014,2019";
const char *email = "megabreit@googlemail.com";
const char *name = "Armin Kunaschik";
const char *version = "1.3";

#include <macros.h>
#include <string.h>
Expand Down Expand Up @@ -644,7 +644,7 @@ int main(int argc, char* argv[])

}

printf("ENTITLEMENT %s ent_used=%.2f(%s) ent=%.2f ent_max=%d vcpu_busy=%.2f%%(%s) |ent_used=%.2f;ent=%.2f;ent_max=%d,vcpu_busy=%.2f\n",
printf("ENTITLEMENT %s ent_used=%.2f(%s) ent=%.2f ent_max=%d vcpu_busy=%.2f%%(%s) |ent_used=%.2f ent=%.2f ent_max=%d vcpu_busy=%.2f\n",
states[ent_pool_state],
phys_proc_consumed,
states[ent_state],
Expand Down

0 comments on commit 8eac4d0

Please sign in to comment.