Skip to content

Commit 5324c4e

Browse files
peterpakospeterpakos
committed
Fix #37 and #38 plus other improvements
Highlights: - Add new check: Services (#37) - Add new check: Netgroups (#38) - Rename and reorder some checks to match FreeIPA UI - Allow connection via IP as well as fqdn/hostname - Show number of certificates/conflicts/ghosts - Update README files - Bump version to 2.7.0
1 parent eac9d9f commit 5324c4e

File tree

5 files changed

+320
-111
lines changed

5 files changed

+320
-111
lines changed

‎README.md‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ directly from the command line.
6262
```
6363
$ cipa --help
6464
usage: cipa [-H [HOSTS [HOSTS ...]]] [-d [DOMAIN]] [-D [BINDDN]] [-W [BINDPW]]
65-
[--version] [--help] [--debug] [--quiet] [-l [LOG_FILE]]
65+
[--help] [--version] [--debug] [--quiet] [-l [LOG_FILE]]
6666
[--no-header] [--no-border]
67-
[-n [{,all,users,ustage,upres,ugroups,hosts,hgroups,hbac,sudo,zones,certs,ldap,ghosts,bind,msdcs,replica}]]
67+
[-n [{,all,users,susers,pusers,hosts,services,ugroups,hgroups,ngroups,hbac,sudo,zones,certs,conflicts,ghosts,bind,msdcs,replicas}]]
6868
[-w WARNING] [-c CRITICAL]
6969
7070
Tool to check consistency across FreeIPA servers
@@ -78,15 +78,15 @@ optional arguments:
7878
Bind DN (default: cn=Directory Manager)
7979
-W [BINDPW], --bindpw [BINDPW]
8080
Bind password
81-
--version show program's version number and exit
8281
--help show this help message and exit
82+
--version show program's version number and exit
8383
--debug debugging mode
8484
--quiet do not log to console
8585
-l [LOG_FILE], --log-file [LOG_FILE]
8686
log to file (./cipa.log by default)
8787
--no-header disable table header
8888
--no-border disable table border
89-
-n [{,all,users,ustage,upres,ugroups,hosts,hgroups,hbac,sudo,zones,certs,ldap,ghosts,bind,msdcs,replica}]
89+
-n [{,all,users,susers,pusers,hosts,services,ugroups,hgroups,ngroups,hbac,sudo,zones,certs,conflicts,ghosts,bind,msdcs,replicas}]
9090
Nagios plugin mode
9191
-w WARNING, --warning WARNING
9292
number of failed checks before warning (default: 1)
@@ -103,17 +103,19 @@ $ cipa -d ipa.example.com -W ********
103103
| Active Users | 1199 | 1199 | 1199 | 1199 | 1199 | 1199 | OK |
104104
| Stage Users | 0 | 0 | 0 | 0 | 0 | 0 | OK |
105105
| Preserved Users | 0 | 0 | 0 | 0 | 0 | 0 | OK |
106-
| User Groups | 55 | 55 | 55 | 55 | 55 | 55 | OK |
107106
| Hosts | 357 | 357 | 357 | 357 | 357 | 357 | OK |
107+
| Services | 49 | 49 | 49 | 49 | 49 | 49 | OK |
108+
| User Groups | 55 | 55 | 55 | 55 | 55 | 55 | OK |
108109
| Host Groups | 29 | 29 | 29 | 29 | 29 | 29 | OK |
110+
| Netgroups | 11 | 11 | 11 | 11 | 11 | 11 | OK |
109111
| HBAC Rules | 3 | 3 | 3 | 3 | 3 | 3 | OK |
110112
| SUDO Rules | 2 | 2 | 2 | 2 | 2 | 2 | OK |
111113
| DNS Zones | 114 | 114 | 114 | 114 | 114 | 114 | OK |
112-
| Certificates | N/A | N/A | N/A | N/A | N/A | N/A | OK |
113-
| LDAP Conflicts | NO | NO | NO | NO | NO | NO | OK |
114-
| Ghost Replicas | NO | NO | NO | NO | NO | NO | OK |
115-
| Anonymous BIND | YES | YES | YES | YES | YES | YES | OK |
116-
| Microsoft ADTrust | NO | NO | NO | NO | NO | NO | OK |
114+
| Certificates | 0 | 0 | 0 | 0 | 0 | 0 | OK |
115+
| LDAP Conflicts | 0 | 0 | 0 | 0 | 0 | 0 | OK |
116+
| Ghost Replicas | 0 | 0 | 0 | 0 | 0 | 0 | OK |
117+
| Anonymous BIND | ON | ON | ON | ON | ON | ON | OK |
118+
| Microsoft ADTrust | False | Fals | False | False | False | False | OK |
117119
| Replication Status | ipa03 0 | ipa03 0 | ipa04 0 | ipa03 0 | ipa03 0 | ipa04 0 | OK |
118120
| | ipa04 0 | ipa04 0 | ipa05 0 | ipa01 0 | ipa01 0 | | |
119121
| | ipa05 0 | ipa05 0 | ipa01 0 | ipa02 0 | ipa02 0 | | |

‎README.rst‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ Help
8383

8484
$ cipa --help
8585
usage: cipa [-H [HOSTS [HOSTS ...]]] [-d [DOMAIN]] [-D [BINDDN]] [-W [BINDPW]]
86-
[--version] [--help] [--debug] [--quiet] [-l [LOG_FILE]]
86+
[--help] [--version] [--debug] [--quiet] [-l [LOG_FILE]]
8787
[--no-header] [--no-border]
88-
[-n [{,all,users,ustage,upres,ugroups,hosts,hgroups,hbac,sudo,zones,certs,ldap,ghosts,bind,msdcs,replica}]]
88+
[-n [{,all,users,susers,pusers,hosts,services,ugroups,hgroups,ngroups,hbac,sudo,zones,certs,conflicts,ghosts,bind,msdcs,replicas}]]
8989
[-w WARNING] [-c CRITICAL]
9090

9191
Tool to check consistency across FreeIPA servers
@@ -99,15 +99,15 @@ Help
9999
Bind DN (default: cn=Directory Manager)
100100
-W [BINDPW], --bindpw [BINDPW]
101101
Bind password
102-
--version show program's version number and exit
103102
--help show this help message and exit
103+
--version show program's version number and exit
104104
--debug debugging mode
105105
--quiet do not log to console
106106
-l [LOG_FILE], --log-file [LOG_FILE]
107107
log to file (./cipa.log by default)
108108
--no-header disable table header
109109
--no-border disable table border
110-
-n [{,all,users,ustage,upres,ugroups,hosts,hgroups,hbac,sudo,zones,certs,ldap,ghosts,bind,msdcs,replica}]
110+
-n [{,all,users,susers,pusers,hosts,services,ugroups,hgroups,ngroups,hbac,sudo,zones,certs,conflicts,ghosts,bind,msdcs,replicas}]
111111
Nagios plugin mode
112112
-w WARNING, --warning WARNING
113113
number of failed checks before warning (default: 1)
@@ -126,17 +126,19 @@ Example
126126
| Active Users | 1199 | 1199 | 1199 | 1199 | 1199 | 1199 | OK |
127127
| Stage Users | 0 | 0 | 0 | 0 | 0 | 0 | OK |
128128
| Preserved Users | 0 | 0 | 0 | 0 | 0 | 0 | OK |
129-
| User Groups | 55 | 55 | 55 | 55 | 55 | 55 | OK |
130129
| Hosts | 357 | 357 | 357 | 357 | 357 | 357 | OK |
130+
| Services | 49 | 49 | 49 | 49 | 49 | 49 | OK |
131+
| User Groups | 55 | 55 | 55 | 55 | 55 | 55 | OK |
131132
| Host Groups | 29 | 29 | 29 | 29 | 29 | 29 | OK |
133+
| Netgroups | 11 | 11 | 11 | 11 | 11 | 11 | OK |
132134
| HBAC Rules | 3 | 3 | 3 | 3 | 3 | 3 | OK |
133135
| SUDO Rules | 2 | 2 | 2 | 2 | 2 | 2 | OK |
134136
| DNS Zones | 114 | 114 | 114 | 114 | 114 | 114 | OK |
135-
| Certificates | N/A | N/A | N/A | N/A | N/A | N/A | OK |
136-
| LDAP Conflicts | NO | NO | NO | NO | NO | NO | OK |
137-
| Ghost Replicas | NO | NO | NO | NO | NO | NO | OK |
138-
| Anonymous BIND | YES | YES | YES | YES | YES | YES | OK |
139-
| Microsoft ADTrust | NO | NO | NO | NO | NO | NO | OK |
137+
| Certificates | 0 | 0 | 0 | 0 | 0 | 0 | OK |
138+
| LDAP Conflicts | 0 | 0 | 0 | 0 | 0 | 0 | OK |
139+
| Ghost Replicas | 0 | 0 | 0 | 0 | 0 | 0 | OK |
140+
| Anonymous BIND | ON | ON | ON | ON | ON | ON | OK |
141+
| Microsoft ADTrust | False | Fals | False | False | False | False | OK |
140142
| Replication Status | ipa03 0 | ipa03 0 | ipa04 0 | ipa03 0 | ipa03 0 | ipa04 0 | OK |
141143
| | ipa04 0 | ipa04 0 | ipa05 0 | ipa01 0 | ipa01 0 | | |
142144
| | ipa05 0 | ipa05 0 | ipa01 0 | ipa02 0 | ipa02 0 | | |

‎checkipaconsistency/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
along with this program. If not, see <http://www.gnu.org/licenses/>.
2323
"""
2424

25-
VERSION = '2.6.2'
25+
VERSION = '2.7.0'

0 commit comments

Comments
 (0)