Commit be8820d6 authored by Pierangelo Masarati's avatar Pierangelo Masarati
Browse files

HEADS-UP: complete reworking of back-monitor

parent 83212279
......@@ -41,8 +41,6 @@
LDAP_BEGIN_DECL
/* #define MONITOR_DEVEL */
/*
* The cache maps DNs to Entries.
* Each entry, on turn, holds the list of its children in the e_private field.
......@@ -73,28 +71,45 @@ struct monitorentrypriv {
};
struct monitorinfo {
/*
* Internal data
*/
Avlnode *mi_cache;
ldap_pvt_thread_mutex_t mi_cache_mutex;
ObjectClass *monitor_oc_monitorServer;
ObjectClass *monitor_oc_monitorContainer;
ObjectClass *monitor_oc_monitorCounter;
ObjectClass *monitor_oc_monitorOperation;
ObjectClass *monitor_oc_monitorConnection;
ObjectClass *monitor_oc_managedObject;
ObjectClass *monitor_oc_monitoredObject;
AttributeDescription *monitor_ad_monitoredInfo;
AttributeDescription *monitor_ad_managedInfo;
AttributeDescription *monitor_ad_monitorCounter;
AttributeDescription *monitor_ad_monitorOpCompleted;
AttributeDescription *monitor_ad_monitorOpInitiated;
AttributeDescription *monitor_ad_monitorConnectionNumber;
AttributeDescription *monitor_ad_monitorConnectionAuthzDN;
AttributeDescription *monitor_ad_monitorConnectionLocalAddress;
AttributeDescription *monitor_ad_monitorConnectionPeerAddress;
AttributeDescription *monitor_ad_description;
/*
* Config parameters
*/
struct berval l;
/*
* Specific schema entities
*/
ObjectClass *oc_monitor;
ObjectClass *oc_monitorServer;
ObjectClass *oc_monitorContainer;
ObjectClass *oc_monitorCounterObject;
ObjectClass *oc_monitorOperation;
ObjectClass *oc_monitorConnection;
ObjectClass *oc_managedObject;
ObjectClass *oc_monitoredObject;
AttributeDescription *ad_monitoredInfo;
AttributeDescription *ad_managedInfo;
AttributeDescription *ad_monitorCounter;
AttributeDescription *ad_monitorOpCompleted;
AttributeDescription *ad_monitorOpInitiated;
AttributeDescription *ad_monitorConnectionNumber;
AttributeDescription *ad_monitorConnectionAuthzDN;
AttributeDescription *ad_monitorConnectionLocalAddress;
AttributeDescription *ad_monitorConnectionPeerAddress;
/*
* Generic description attribute
*/
AttributeDescription *ad_description;
AttributeDescription *ad_seeAlso;
};
/*
......@@ -149,54 +164,41 @@ struct monitorinfo {
#define SLAPD_MONITOR_CONN_DN \
SLAPD_MONITOR_CONN_RDN "," SLAPD_MONITOR_DN
#define SLAPD_MONITOR_READW 7
#define SLAPD_MONITOR_READW_NAME "Read Waiters"
#define SLAPD_MONITOR_READW_RDN \
"cn=" SLAPD_MONITOR_READW_NAME
#define SLAPD_MONITOR_READW_DN \
SLAPD_MONITOR_READW_RDN "," SLAPD_MONITOR_DN
#define SLAPD_MONITOR_WRITEW 8
#define SLAPD_MONITOR_WRITEW_NAME "Write Waiters"
#define SLAPD_MONITOR_WRITEW_RDN \
"cn=" SLAPD_MONITOR_WRITEW_NAME
#define SLAPD_MONITOR_WRITEW_DN \
SLAPD_MONITOR_WRITEW_RDN "," SLAPD_MONITOR_DN
#define SLAPD_MONITOR_LOG 9
#define SLAPD_MONITOR_RWW 7
#define SLAPD_MONITOR_RWW_NAME "Waiters"
#define SLAPD_MONITOR_RWW_RDN \
"cn=" SLAPD_MONITOR_RWW_NAME
#define SLAPD_MONITOR_RWW_DN \
SLAPD_MONITOR_RWW_RDN "," SLAPD_MONITOR_DN
#define SLAPD_MONITOR_LOG 8
#define SLAPD_MONITOR_LOG_NAME "Log"
#define SLAPD_MONITOR_LOG_RDN \
"cn=" SLAPD_MONITOR_LOG_NAME
#define SLAPD_MONITOR_LOG_DN \
SLAPD_MONITOR_LOG_RDN "," SLAPD_MONITOR_DN
#define SLAPD_MONITOR_OPS 10
#define SLAPD_MONITOR_OPS 9
#define SLAPD_MONITOR_OPS_NAME "Operations"
#define SLAPD_MONITOR_OPS_RDN \
"cn=" SLAPD_MONITOR_OPS_NAME
#define SLAPD_MONITOR_OPS_DN \
SLAPD_MONITOR_OPS_RDN "," SLAPD_MONITOR_DN
#define SLAPD_MONITOR_SENT 11
#define SLAPD_MONITOR_SENT 10
#define SLAPD_MONITOR_SENT_NAME "Statistics"
#define SLAPD_MONITOR_SENT_RDN \
"cn=" SLAPD_MONITOR_SENT_NAME
#define SLAPD_MONITOR_SENT_DN \
SLAPD_MONITOR_SENT_RDN "," SLAPD_MONITOR_DN
#define SLAPD_MONITOR_TIME 12
#define SLAPD_MONITOR_TIME 11
#define SLAPD_MONITOR_TIME_NAME "Time"
#define SLAPD_MONITOR_TIME_RDN \
"cn=" SLAPD_MONITOR_TIME_NAME
#define SLAPD_MONITOR_TIME_DN \
SLAPD_MONITOR_TIME_RDN "," SLAPD_MONITOR_DN
#define SLAPD_MONITOR_OBJECTCLASSES \
"objectClass: top\n" \
"objectClass: monitor\n" \
"objectClass: extensibleObject\n" \
"structuralObjectClass: monitor\n"
struct monitorsubsys {
int mss_type;
char *mss_name;
......
......@@ -77,15 +77,19 @@ monitor_subsys_backend_init(
char buf[1024];
BackendInfo *bi;
struct berval bv;
int j;
bi = &backendInfo[i];
snprintf( buf, sizeof( buf ),
"dn: cn=Backend %d,%s\n"
SLAPD_MONITOR_OBJECTCLASSES
"objectClass: %s\n"
"structuralObjectClass: %s\n"
"cn: Backend %d\n",
i,
monitor_subsys[SLAPD_MONITOR_BACKEND].mss_dn.bv_val,
mi->oc_monitoredObject->soc_cname.bv_val,
mi->oc_monitoredObject->soc_cname.bv_val,
i );
e = str2entry( buf );
......@@ -109,9 +113,9 @@ monitor_subsys_backend_init(
bv.bv_val = bi->bi_type;
bv.bv_len = strlen( bv.bv_val );
attr_merge_normalize_one( e, mi->monitor_ad_description,
attr_merge_normalize_one( e, mi->ad_monitoredInfo,
&bv, NULL );
attr_merge_normalize_one( e_backend, mi->monitor_ad_description,
attr_merge_normalize_one( e_backend, mi->ad_monitoredInfo,
&bv, NULL );
if ( bi->bi_controls ) {
......@@ -123,6 +127,24 @@ monitor_subsys_backend_init(
attr_merge_one( e, slap_schema.si_ad_supportedControl, &bv, NULL );
}
}
for ( j = 0; j < nBackendDB; j++ ) {
BackendDB *be = &backendDB[j];
char buf[ SLAP_LDAPDN_MAXLEN ];
struct berval dn;
if ( be->bd_info != bi ) {
continue;
}
snprintf( buf, sizeof( buf ), "cn=Database %d,%s",
j, monitor_subsys[SLAPD_MONITOR_DATABASE].mss_dn.bv_val );
dn.bv_val = buf;
dn.bv_len = strlen( buf );
attr_merge_normalize_one( e, mi->ad_seeAlso,
&dn, NULL );
}
mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
e->e_private = ( void * )mp;
......
......@@ -81,9 +81,12 @@ monitor_subsys_conn_init(
*/
snprintf( buf, sizeof( buf ),
"dn: cn=Total,%s\n"
SLAPD_MONITOR_OBJECTCLASSES
"objectClass: %s\n"
"structuralObjectClass: %s\n"
"cn: Total\n",
monitor_subsys[SLAPD_MONITOR_CONN].mss_dn.bv_val );
monitor_subsys[SLAPD_MONITOR_CONN].mss_dn.bv_val,
mi->oc_monitorCounterObject->soc_cname.bv_val,
mi->oc_monitorCounterObject->soc_cname.bv_val );
e = str2entry( buf );
if ( e == NULL ) {
......@@ -104,7 +107,7 @@ monitor_subsys_conn_init(
bv.bv_val = "0";
bv.bv_len = 1;
attr_merge_one( e, mi->monitor_ad_description, &bv, NULL );
attr_merge_one( e, mi->ad_monitorCounter, &bv, NULL );
mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
e->e_private = ( void * )mp;
......@@ -138,9 +141,12 @@ monitor_subsys_conn_init(
*/
snprintf( buf, sizeof( buf ),
"dn: cn=Current,%s\n"
SLAPD_MONITOR_OBJECTCLASSES
"objectClass: %s\n"
"structuralObjectClass: %s\n"
"cn: Current\n",
monitor_subsys[SLAPD_MONITOR_CONN].mss_dn.bv_val );
monitor_subsys[SLAPD_MONITOR_CONN].mss_dn.bv_val,
mi->oc_monitorCounterObject->soc_cname.bv_val,
mi->oc_monitorCounterObject->soc_cname.bv_val );
e = str2entry( buf );
if ( e == NULL ) {
......@@ -161,7 +167,7 @@ monitor_subsys_conn_init(
bv.bv_val = "0";
bv.bv_len = 1;
attr_merge_one( e, mi->monitor_ad_description, &bv, NULL );
attr_merge_one( e, mi->ad_monitorCounter, &bv, NULL );
mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
e->e_private = ( void * )mp;
......@@ -231,7 +237,7 @@ monitor_subsys_conn_update(
Attribute *a;
char buf[16];
a = attr_find( e->e_attrs, mi->monitor_ad_description );
a = attr_find( e->e_attrs, mi->ad_monitorCounter );
if ( a == NULL ) {
return( -1 );
}
......@@ -266,9 +272,12 @@ conn_create(
snprintf( buf, sizeof( buf ),
"dn: cn=" CONN_CN_PREFIX " %ld,%s\n"
SLAPD_MONITOR_OBJECTCLASSES
"objectClass: %s\n"
"structuralObjectClass: %s\n"
"cn: " CONN_CN_PREFIX " %ld\n",
c->c_connid, monitor_subsys[SLAPD_MONITOR_CONN].mss_dn.bv_val,
mi->oc_monitorConnection->soc_cname.bv_val,
mi->oc_monitorConnection->soc_cname.bv_val,
c->c_connid );
e = str2entry( buf );
......@@ -300,6 +309,7 @@ conn_create(
ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
/* monitored info */
sprintf( buf,
"%ld : %ld "
": %ld/%ld/%ld/%ld "
......@@ -335,7 +345,25 @@ conn_create(
bv.bv_val = buf;
bv.bv_len = strlen( buf );
attr_merge_one( e, mi->monitor_ad_description, &bv, NULL );
attr_merge_one( e, mi->ad_monitoredInfo, &bv, NULL );
/* connection number */
snprintf( buf, sizeof( buf ), "%ld", c->c_connid );
bv.bv_val = buf;
bv.bv_len = strlen( buf );
attr_merge_one( e, mi->ad_monitorConnectionNumber, &bv, NULL );
/* authz DN */
attr_merge_one( e, mi->ad_monitorConnectionAuthzDN,
&c->c_dn, &c->c_ndn );
/* local address */
attr_merge_one( e, mi->ad_monitorConnectionLocalAddress,
&c->c_sock_name, NULL );
/* peer address */
attr_merge_one( e, mi->ad_monitorConnectionPeerAddress,
&c->c_peer_name, NULL );
mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
e->e_private = ( void * )mp;
......@@ -422,7 +450,7 @@ monitor_subsys_conn_create(
c = connection_next( c, &connindex )) {
if ( c->c_connid == connid ) {
if ( conn_create( mi, c, ep ) || *ep == NULL ) {
connection_done(c);
connection_done( c );
return( -1 );
}
......
......@@ -52,9 +52,6 @@ monitor_subsys_database_init(
Entry *e, *e_database, *e_tmp;
int i;
struct monitorentrypriv *mp;
AttributeDescription *ad_nc = slap_schema.si_ad_namingContexts;
AttributeDescription *ad_mc = slap_schema.si_ad_monitorContext;
AttributeDescription *ad_seeAlso = NULL;
const char *text = NULL;
assert( be != NULL );
......@@ -79,21 +76,6 @@ monitor_subsys_database_init(
return( -1 );
}
if ( slap_str2ad( "seeAlso", &ad_seeAlso, &text ) != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, CRIT,
"monitor_subsys_database_init: "
"unable to find 'seeAlso' attribute description\n",
0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_database_init: "
"unable to find 'seeAlso' attribute description\n",
0, 0, 0 );
#endif
return( -1 );
}
e_tmp = NULL;
for ( i = nBackendDB; i--; ) {
char buf[1024];
......@@ -108,12 +90,17 @@ monitor_subsys_database_init(
snprintf( buf, sizeof( buf ),
"dn: cn=Database %d,%s\n"
SLAPD_MONITOR_OBJECTCLASSES
"objectClass: %s\n"
"structuralObjectClass: %s\n"
"cn: Database %d\n"
"description: %s",
"description: This object contains the type of the database.\n"
"%s: %s",
i,
monitor_subsys[SLAPD_MONITOR_DATABASE].mss_dn.bv_val,
mi->oc_monitoredObject->soc_cname.bv_val,
mi->oc_monitoredObject->soc_cname.bv_val,
i,
mi->ad_monitoredInfo->ad_cname.bv_val,
be->bd_info->bi_type );
e = str2entry( buf );
......@@ -135,11 +122,15 @@ monitor_subsys_database_init(
}
if ( be->be_flags & SLAP_BFLAG_MONITOR ) {
attr_merge( e, ad_mc, be->be_suffix, be->be_nsuffix );
attr_merge( e_database, ad_mc, be->be_suffix, be->be_nsuffix );
attr_merge( e, slap_schema.si_ad_monitorContext,
be->be_suffix, be->be_nsuffix );
attr_merge( e_database, slap_schema.si_ad_monitorContext,
be->be_suffix, be->be_nsuffix );
} else {
attr_merge( e, ad_nc, be->be_suffix, be->be_nsuffix );
attr_merge( e_database, ad_nc, be->be_suffix, be->be_nsuffix );
attr_merge( e, slap_schema.si_ad_namingContexts,
be->be_suffix, be->be_nsuffix );
attr_merge( e_database, slap_schema.si_ad_namingContexts,
be->be_suffix, be->be_nsuffix );
}
for ( j = nBackendInfo; j--; ) {
......@@ -151,7 +142,8 @@ monitor_subsys_database_init(
j, monitor_subsys[SLAPD_MONITOR_BACKEND].mss_dn.bv_val );
bv.bv_val = buf;
bv.bv_len = strlen( buf );
attr_merge_normalize_one( e, ad_seeAlso, &bv, NULL );
attr_merge_normalize_one( e, mi->ad_seeAlso,
&bv, NULL );
break;
}
}
......@@ -240,7 +232,7 @@ monitor_back_add_plugin( Backend *be, Entry *e_database )
bv.bv_val = buf;
bv.bv_len = strlen( buf );
attr_merge_normalize_one( e_database,
mi->monitor_ad_description, &bv, NULL );
mi->ad_monitoredInfo, &bv, NULL );
i++;
......
......@@ -106,21 +106,13 @@ struct monitorsubsys monitor_subsys[] = {
monitor_subsys_conn_create,
NULL /* modify */
}, {
SLAPD_MONITOR_READW, SLAPD_MONITOR_READW_NAME,
SLAPD_MONITOR_RWW, SLAPD_MONITOR_RWW_NAME,
BER_BVNULL, BER_BVNULL, BER_BVNULL,
MONITOR_F_NONE,
NULL, /* init */
monitor_subsys_readw_update,
MONITOR_F_PERSISTENT_CH,
monitor_subsys_rww_init,
monitor_subsys_rww_update,
NULL, /* create */
NULL /* modify */
}, {
SLAPD_MONITOR_WRITEW, SLAPD_MONITOR_WRITEW_NAME,
BER_BVNULL, BER_BVNULL, BER_BVNULL,
MONITOR_F_NONE,
NULL, /* init */
monitor_subsys_writew_update,
NULL, /* create */
NULL /* modify */
}, {
SLAPD_MONITOR_LOG, SLAPD_MONITOR_LOG_NAME,
BER_BVNULL, BER_BVNULL, BER_BVNULL,
......@@ -237,11 +229,81 @@ monitor_back_db_init(
)
{
struct monitorinfo *mi;
int rc;
struct berval dn, ndn;
struct berval bv;
/*
* database monitor can be defined once only
*/
if ( be_monitor ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, CRIT,
"only one monitor backend is allowed\n", 0, 0, 0);
#else
Debug( LDAP_DEBUG_ANY,
"only one monitor backend is allowed\n", 0, 0, 0 );
#endif
return( -1 );
}
be_monitor = be;
/* indicate system schema supported */
be->be_flags |= SLAP_BFLAG_MONITOR;
dn.bv_val = SLAPD_MONITOR_DN;
dn.bv_len = sizeof( SLAPD_MONITOR_DN ) - 1;
rc = dnNormalize2( NULL, &dn, &ndn, NULL );
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, CRIT,
"unable to normalize monitor DN \"" SLAPD_MONITOR_DN
"\"\n" , 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"unable to normalize monitor DN \"" SLAPD_MONITOR_DN
"\"\n", 0, 0, 0 );
#endif
return -1;
}
ber_dupbv( &bv, &dn );
ber_bvarray_add( &be->be_suffix, &bv );
ber_bvarray_add( &be->be_nsuffix, &ndn );
mi = ( struct monitorinfo * )ch_calloc( sizeof( struct monitorinfo ), 1 );
if ( mi == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, CRIT,
"unable to initialize monitor backend\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"unable to initialize monitor backend\n", 0, 0, 0 );
#endif
return -1;
}
memset( mi, 0, sizeof( struct monitorinfo ) );
ldap_pvt_thread_mutex_init( &mi->mi_cache_mutex );
be->be_private = mi;
return 0;
}
int
monitor_back_db_open(
BackendDB *be
)
{
struct monitorinfo *mi = (struct monitorinfo *)be->be_private;
struct monitorsubsys *ms;
Entry *e, *e_tmp;
struct monitorentrypriv *mp;
int i, rc;
int i;
char buf[1024], *end_of_line;
struct berval dn, ndn;
const char *text;
struct berval bv;
struct m_s {
......@@ -249,46 +311,57 @@ monitor_back_db_init(
char *schema;
int offset;
} moc[] = {
#ifdef MONITOR_DEVEL
{ "monitor", "( 1.3.6.1.4.1.4203.666.3.2 "
"NAME 'monitor' "
"DESC 'OpenLDAP system monitoring' "
"SUP top STRUCTURAL "
"MUST cn "
"MAY ( "
"description "
"$ seeAlso "
"$ monitoredInfo "
") )",
offsetof(struct monitorinfo, oc_monitor) },
{ "monitorServer", "( 1.3.6.1.4.1.4203.666.3.7 "
"NAME 'monitorServer' "
"DESC 'Server monitoring root entry' "
"SUP monitor STRUCTURAL )",
offsetof(struct monitorinfo, monitor_oc_monitorServer) },
"SUP monitor STRUCTURAL "
"MAY ( "
"l "
") )",
offsetof(struct monitorinfo, oc_monitorServer) },
{ "monitorContainer", "( 1.3.6.1.4.1.4203.666.3.8 "
"NAME 'monitorContainer' "
"DESC 'monitor container class' "
"SUP monitor STRUCTURAL )",
offsetof(struct monitorinfo, monitor_oc_monitorContainer) },
{ "monitorCounter", "( 1.3.6.1.4.1.4203.666.3.9 "
"NAME 'monitorCounter' "
offsetof(struct monitorinfo, oc_monitorContainer) },
{ "monitorCounterObject", "( 1.3.6.1.4.1.4203.666.3.9 "
"NAME 'monitorCounterObject' "
"DESC 'monitor counter class' "
"SUP monitor STRUCTURAL )",
offsetof(struct monitorinfo, monitor_oc_monitorCounter) },
offsetof(struct monitorinfo, oc_monitorCounterObject) },
{ "monitorOperation", "( 1.3.6.1.4.1.4203.666.3.10 "
"NAME 'monitorOperation' "
"DESC 'monitor operation class' "
"SUP monitor STRUCTURAL )",
offsetof(struct monitorinfo, monitor_oc_monitorOperation) },
offsetof(struct monitorinfo, oc_monitorOperation) },
{ "monitorConnection", "( 1.3.6.1.4.1.4203.666.3.11 "
"NAME 'monitorConnection' "
"DESC 'monitor connection class' "
"SUP monitor STRUCTURAL )",
offsetof(struct monitorinfo, monitor_oc_monitorConnection) },
offsetof(struct monitorinfo, oc_monitorConnection) },
{ "managedObject", "( 1.3.6.1.4.1.4203.666.3.12 "
"NAME 'managedObject' "
"DESC 'monitor managed entity class' "
"SUP monitor STRUCTURAL )",
offsetof(struct monitorinfo, monitor_oc_managedObject) },
offsetof(struct monitorinfo, oc_managedObject) },
{ "monitoredObject", "( 1.3.6.1.4.1.4203.666.3.13 "
"NAME 'monitoredObject' "
"DESC 'monitor monitored entity class' "
"SUP monitor STRUCTURAL )",
offsetof(struct monitorinfo, monitor_oc_monitoredObject) },
#endif /* MONITOR_DEVEL */
offsetof(struct monitorinfo, oc_monitoredObject) },
{ NULL, NULL, -1 }
}, mat[] = {
#ifdef MONITOR_DEVEL
{ "monitoredInfo", "( 1.3.6.1.4.1.4203.666.1.14 "
"NAME 'monitoredInfo' "
"DESC 'monitored info' "
......@@ -298,12 +371,12 @@ monitor_back_db_init(
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32768} "
"NO-USER-MODIFICATION "
"USAGE directoryOperation )",
offsetof(struct monitorinfo, monitor_ad_monitoredInfo) },
offsetof(struct monitorinfo, ad_monitoredInfo) },
{ "managedInfo", "( 1.3.6.1.4.1.4203.666.1.15 "
"NAME 'managedInfo' "
"DESC 'monitor managed info' "
"SUP name )",
offsetof(struct monitorinfo, monitor_ad_managedInfo) },
offsetof(struct monitorinfo, ad_managedInfo) },
{ "monitorCounter", "( 1.3.6.1.4.1.4203.666.1.16 "
"NAME 'monitorCounter' "
"DESC 'monitor counter' "
......@@ -312,28 +385,28 @@ monitor_back_db_init(
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 "
"NO-USER-MODIFICATION "
"USAGE directoryOperation )",
offsetof(struct monitorinfo, monitor_ad_monitorCounter) },
offsetof(struct monitorinfo, ad_monitorCounter) },
{ "monitorOpCompleted", "( 1.3.6.1.4.1.4203.666.1.17 "
"NAME 'monitorOpCompleted' "
"DESC 'monitor completed operations' "
"SUP monitorCounter "
"NO-USER-MODIFICATION "
"USAGE directoryOperation )",
offsetof(struct monitorinfo, monitor_ad_monitorOpCompleted) },
offsetof(struct monitorinfo, ad_monitorOpCompleted) },
{ "monitorOpInitiated", "( 1.3.6.1.4.1.4203.666.1.18 "
"NAME 'monitorOpInitiated' "
"DESC 'monitor initiated operations' "
"SUP monitorCounter "
"NO-USER-MODIFICATION "
"USAGE directoryOperation )",
offsetof(struct monitorinfo, monitor_ad_monitorOpInitiated) },
offsetof(struct monitorinfo, ad_monitorOpInitiated) },
{ "monitorConnectionNumber", "( 1.3.6.1.4.1.4203.666.1.19 "
"NAME 'monitorConnectionNumber' "