From: Gunnar Beutner Date: Sat, 30 Jun 2012 11:39:55 +0000 (+0200) Subject: Implemented host and service groups. X-Git-Tag: v0.0.1~344 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b576bb5ecc8b6aeecc8d06be2517583612f221bc;p=icinga2 Implemented host and service groups. --- diff --git a/components/compat/compatcomponent.cpp b/components/compat/compatcomponent.cpp index f356de4e8..414026b9f 100644 --- a/components/compat/compatcomponent.cpp +++ b/components/compat/compatcomponent.cpp @@ -82,7 +82,6 @@ void CompatComponent::DumpHostObject(ofstream& fp, Host host) { fp << "define host {" << "\n" << "\t" << "host_name" << "\t" << host.GetName() << "\n" - << "\t" << "hostgroups" << "\t" << "all-hosts" << "\n" << "\t" << "check_interval" << "\t" << 1 << "\n" << "\t" << "retry_interval" << "\t" << 1 << "\n" << "\t" << "max_check_attempts" << "\t" << 1 << "\n" @@ -154,6 +153,20 @@ void CompatComponent::DumpServiceObject(ofstream& fp, Service service) << "\n"; } +void CompatComponent::DumpStringList(ofstream& fp, const vector& list) +{ + vector::const_iterator it; + bool first = true; + for (it = list.begin(); it != list.end(); it++) { + if (!first) + fp << ","; + else + first = false; + + fp << *it; + } +} + /** * Periodically writes the status.dat and objects.cache files. */ @@ -194,40 +207,96 @@ void CompatComponent::StatusTimerHandler(void) << "# This file is auto-generated. Do not modify this file." << "\n" << "\n"; - objectfp << "define hostgroup {" << "\n" - << "\t" << "hostgroup_name" << "\t" << "all-hosts" << "\n"; + map > hostgroups; ConfigObject::TMap::Range range; range = ConfigObject::GetObjects("host"); ConfigObject::TMap::Iterator it; + for (it = range.first; it != range.second; it++) { + Host host = it->second; - if (range.first != range.second) { - objectfp << "\t" << "members" << "\t"; - for (it = range.first; it != range.second; it++) { - Host host(it->second); + Dictionary::Ptr dict; + DictionaryIterator dt; - objectfp << host.GetName(); + dict = host.GetGroups(); - if (distance(it, range.second) != 1) - objectfp << ","; + if (dict) { + for (dt = dict->Begin(); dt != dict->End(); dt++) + hostgroups[dt->second].push_back(host.GetName()); } - objectfp << "\n"; + + DumpHostStatus(statusfp, host); + DumpHostObject(objectfp, host); } - objectfp << "\t" << "}" << "\n" - << "\n"; + map >::iterator hgt; + for (hgt = hostgroups.begin(); hgt != hostgroups.end(); hgt++) { + objectfp << "define hostgroup {" << "\n" + << "\t" << "hostgroup_name" << "\t" << hgt->first << "\n"; - for (it = range.first; it != range.second; it++) { - DumpHostStatus(statusfp, it->second); - DumpHostObject(objectfp, it->second); + if (HostGroup::Exists(hgt->first)) { + HostGroup hg = HostGroup::GetByName(hgt->first); + objectfp << "\t" << "alias" << "\t" << hg.GetAlias() << "\n" + << "\t" << "notes_url" << "\t" << hg.GetNotesUrl() << "\n" + << "\t" << "action_url" << "\t" << hg.GetActionUrl() << "\n"; + } + + objectfp << "\t" << "members" << "\t"; + + DumpStringList(objectfp, hgt->second); + + objectfp << "\n" + << "}" << "\n"; } range = ConfigObject::GetObjects("service"); + map > servicegroups; + for (it = range.first; it != range.second; it++) { - DumpServiceStatus(statusfp, it->second); - DumpServiceObject(objectfp, it->second); + Service service = it->second; + + Dictionary::Ptr dict; + DictionaryIterator dt; + + dict = service.GetGroups(); + + if (dict) { + for (dt = dict->Begin(); dt != dict->End(); dt++) + servicegroups[dt->second].push_back(service); + } + + DumpServiceStatus(statusfp, service); + DumpServiceObject(objectfp, service); + } + + map >::iterator sgt; + for (sgt = servicegroups.begin(); sgt != servicegroups.end(); sgt++) { + objectfp << "define servicegroup {" << "\n" + << "\t" << "servicegroup_name" << "\t" << sgt->first << "\n"; + + if (ServiceGroup::Exists(sgt->first)) { + ServiceGroup sg = ServiceGroup::GetByName(sgt->first); + objectfp << "\t" << "alias" << "\t" << sg.GetAlias() << "\n" + << "\t" << "notes_url" << "\t" << sg.GetNotesUrl() << "\n" + << "\t" << "action_url" << "\t" << sg.GetActionUrl() << "\n"; + } + + objectfp << "\t" << "members" << "\t"; + + vector sglist; + vector::iterator vt; + + for (vt = sgt->second.begin(); vt != sgt->second.end(); vt++) { + sglist.push_back(vt->GetHost().GetName()); + sglist.push_back(vt->GetName()); + } + + DumpStringList(objectfp, sglist); + + objectfp << "\n" + << "}" << "\n"; } statusfp.close(); diff --git a/components/compat/compatcomponent.h b/components/compat/compatcomponent.h index ba31359ab..b700a580c 100644 --- a/components/compat/compatcomponent.h +++ b/components/compat/compatcomponent.h @@ -39,6 +39,8 @@ private: void DumpHostStatus(ofstream& fp, Host host); void DumpHostObject(ofstream& fp, Host host); + void DumpStringList(ofstream& fp, const vector& list); + void DumpServiceStatus(ofstream& fp, Service service); void DumpServiceObject(ofstream& fp, Service service); diff --git a/dyn/config_parser.cc b/dyn/config_parser.cc index e409b7a95..f8498050d 100644 --- a/dyn/config_parser.cc +++ b/dyn/config_parser.cc @@ -1,8 +1,10 @@ -/* A Bison parser, made by GNU Bison 2.5. */ -/* Bison implementation for Yacc-like parsers in C +/* A Bison parser, made by GNU Bison 2.4.1. */ + +/* Skeleton implementation for Bison's Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -44,7 +46,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.5" +#define YYBISON_VERSION "2.4.1" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -66,8 +68,8 @@ /* Copy the first part of user declarations. */ -/* Line 268 of yacc.c */ -#line 71 "config_parser.cc" +/* Line 189 of yacc.c */ +#line 73 "config_parser.cc" /* Enabling traces. */ #ifndef YYDEBUG @@ -89,7 +91,7 @@ /* "%code requires" blocks. */ -/* Line 288 of yacc.c */ +/* Line 209 of yacc.c */ #line 1 "config_parser.yy" /****************************************************************************** @@ -120,8 +122,8 @@ using namespace icinga; -/* Line 288 of yacc.c */ -#line 125 "config_parser.cc" +/* Line 209 of yacc.c */ +#line 127 "config_parser.cc" /* Tokens. */ #ifndef YYTOKENTYPE @@ -170,7 +172,7 @@ using namespace icinga; typedef union YYSTYPE { -/* Line 293 of yacc.c */ +/* Line 214 of yacc.c */ #line 38 "config_parser.yy" char *text; @@ -180,8 +182,8 @@ typedef union YYSTYPE -/* Line 293 of yacc.c */ -#line 185 "config_parser.cc" +/* Line 214 of yacc.c */ +#line 187 "config_parser.cc" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -204,7 +206,7 @@ typedef struct YYLTYPE /* Copy the second part of user declarations. */ -/* Line 343 of yacc.c */ +/* Line 264 of yacc.c */ #line 67 "config_parser.yy" @@ -244,8 +246,8 @@ void ConfigCompiler::Compile(void) -/* Line 343 of yacc.c */ -#line 249 "config_parser.cc" +/* Line 264 of yacc.c */ +#line 251 "config_parser.cc" #ifdef short # undef short @@ -295,7 +297,7 @@ typedef short int yytype_int16; #define YYSIZE_MAXIMUM ((YYSIZE_T) -1) #ifndef YY_ -# if defined YYENABLE_NLS && YYENABLE_NLS +# if YYENABLE_NLS # if ENABLE_NLS # include /* INFRINGES ON USER NAME SPACE */ # define YY_(msgid) dgettext ("bison-runtime", msgid) @@ -348,11 +350,11 @@ YYID (yyi) # define alloca _alloca # else # define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ +# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) # include /* INFRINGES ON USER NAME SPACE */ -# ifndef EXIT_SUCCESS -# define EXIT_SUCCESS 0 +# ifndef _STDLIB_H +# define _STDLIB_H 1 # endif # endif # endif @@ -375,24 +377,24 @@ YYID (yyi) # ifndef YYSTACK_ALLOC_MAXIMUM # define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM # endif -# if (defined __cplusplus && ! defined EXIT_SUCCESS \ +# if (defined __cplusplus && ! defined _STDLIB_H \ && ! ((defined YYMALLOC || defined malloc) \ && (defined YYFREE || defined free))) # include /* INFRINGES ON USER NAME SPACE */ -# ifndef EXIT_SUCCESS -# define EXIT_SUCCESS 0 +# ifndef _STDLIB_H +# define _STDLIB_H 1 # endif # endif # ifndef YYMALLOC # define YYMALLOC malloc -# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ +# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ # endif # endif # ifndef YYFREE # define YYFREE free -# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ +# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif @@ -423,7 +425,23 @@ union yyalloc ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \ + 2 * YYSTACK_GAP_MAXIMUM) -# define YYCOPY_NEEDED 1 +/* Copy COUNT objects from FROM to TO. The source and destination do + not overlap. */ +# ifndef YYCOPY +# if defined __GNUC__ && 1 < __GNUC__ +# define YYCOPY(To, From, Count) \ + __builtin_memcpy (To, From, (Count) * sizeof (*(From))) +# else +# define YYCOPY(To, From, Count) \ + do \ + { \ + YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (To)[yyi] = (From)[yyi]; \ + } \ + while (YYID (0)) +# endif +# endif /* Relocate STACK from its old location to the new one. The local variables YYSIZE and YYSTACKSIZE give the old and new number of @@ -443,26 +461,6 @@ union yyalloc #endif -#if defined YYCOPY_NEEDED && YYCOPY_NEEDED -/* Copy COUNT objects from FROM to TO. The source and destination do - not overlap. */ -# ifndef YYCOPY -# if defined __GNUC__ && 1 < __GNUC__ -# define YYCOPY(To, From, Count) \ - __builtin_memcpy (To, From, (Count) * sizeof (*(From))) -# else -# define YYCOPY(To, From, Count) \ - do \ - { \ - YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ - } \ - while (YYID (0)) -# endif -# endif -#endif /* !YYCOPY_NEEDED */ - /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ @@ -606,8 +604,8 @@ static const yytype_uint8 yyr2[] = 1, 0, 4, 1, 1, 2, 0, 1, 3 }; -/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. - Performed when YYTABLE doesn't specify something else to do. Zero +/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state + STATE-NUM when YYTABLE doesn't specify something else to do. Zero means the default is an error. */ static const yytype_uint8 yydefact[] = { @@ -652,7 +650,8 @@ static const yytype_int8 yypgoto[] = /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which - number is the opposite. If YYTABLE_NINF, syntax error. */ + number is the opposite. If zero, do what YYDEFACT says. + If YYTABLE_NINF, syntax error. */ #define YYTABLE_NINF -1 static const yytype_uint8 yytable[] = { @@ -663,12 +662,6 @@ static const yytype_uint8 yytable[] = 51, 59, 24, 61, 52, 62, 0, 27, 60 }; -#define yypact_value_is_default(yystate) \ - ((yystate) == (-46)) - -#define yytable_value_is_error(yytable_value) \ - YYID (0) - static const yytype_int8 yycheck[] = { 3, 4, 5, 7, 8, 9, 10, 11, 53, 0, @@ -703,18 +696,9 @@ static const yytype_uint8 yystos[] = /* Like YYERROR except do call yyerror. This remains here temporarily to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. However, - YYFAIL appears to be in use. Nevertheless, it is formally deprecated - in Bison 2.4.2's NEWS entry, where a plan to phase it out is - discussed. */ + Once GCC version 2 has supplanted version 1, this can go. */ #define YYFAIL goto yyerrlab -#if defined YYFAIL - /* This is here to suppress warnings from the GCC cpp's - -Wunused-macros. Normally we don't worry about that warning, but - some users do, and we want to make it easy for users to remove - YYFAIL uses, which will produce warnings from Bison 2.5. */ -#endif #define YYRECOVERING() (!!yyerrstatus) @@ -724,6 +708,7 @@ do \ { \ yychar = (Token); \ yylval = (Value); \ + yytoken = YYTRANSLATE (yychar); \ YYPOPSTACK (1); \ goto yybackup; \ } \ @@ -770,7 +755,7 @@ while (YYID (0)) we won't break user code: when these are the locations we know. */ #ifndef YY_LOCATION_PRINT -# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL +# if YYLTYPE_IS_TRIVIAL # define YY_LOCATION_PRINT(File, Loc) \ fprintf (File, "%d.%d-%d.%d", \ (Loc).first_line, (Loc).first_column, \ @@ -979,6 +964,7 @@ int yydebug; # define YYMAXDEPTH 10000 #endif + #if YYERROR_VERBOSE @@ -1081,142 +1067,115 @@ yytnamerr (char *yyres, const char *yystr) } # endif -/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message - about the unexpected token YYTOKEN for the state stack whose top is - YYSSP. - - Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is - not large enough to hold the message. In that case, also set - *YYMSG_ALLOC to the required number of bytes. Return 2 if the - required number of bytes is too large to store. */ -static int -yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, - yytype_int16 *yyssp, int yytoken) +/* Copy into YYRESULT an error message about the unexpected token + YYCHAR while in state YYSTATE. Return the number of bytes copied, + including the terminating null byte. If YYRESULT is null, do not + copy anything; just return the number of bytes that would be + copied. As a special case, return 0 if an ordinary "syntax error" + message will do. Return YYSIZE_MAXIMUM if overflow occurs during + size calculation. */ +static YYSIZE_T +yysyntax_error (char *yyresult, int yystate, int yychar) { - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]); - YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; - enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; - /* Internationalized format string. */ - const char *yyformat = 0; - /* Arguments of yyformat. */ - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - /* Number of reported tokens (one for the "unexpected", one per - "expected"). */ - int yycount = 0; - - /* There are many possibilities here to consider: - - Assume YYFAIL is not used. It's too flawed to consider. See - - for details. YYERROR is fine as it does not invoke this - function. - - If this state is a consistent state with a default action, then - the only way this function was invoked is if the default action - is an error action. In that case, don't check for expected - tokens because there are none. - - The only way there can be no lookahead present (in yychar) is if - this state is a consistent state with a default action. Thus, - detecting the absence of a lookahead is sufficient to determine - that there is no unexpected or expected token to report. In that - case, just report a simple "syntax error". - - Don't assume there isn't a lookahead just because this state is a - consistent state with a default action. There might have been a - previous inconsistent state, consistent state with a non-default - action, or user semantic action that manipulated yychar. - - Of course, the expected token list depends on states to have - correct lookahead information, and it depends on the parser not - to perform extra reductions after fetching a lookahead from the - scanner and before detecting a syntax error. Thus, state merging - (from LALR or IELR) and default reductions corrupt the expected - token list. However, the list is correct for canonical LR with - one exception: it will still contain any token that will not be - accepted due to an error action in a later state. - */ - if (yytoken != YYEMPTY) - { - int yyn = yypact[*yyssp]; - yyarg[yycount++] = yytname[yytoken]; - if (!yypact_value_is_default (yyn)) - { - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. In other words, skip the first -YYN actions for - this state because they are default actions. */ - int yyxbegin = yyn < 0 ? -yyn : 0; - /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn + 1; - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yyx; - - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR - && !yytable_value_is_error (yytable[yyx + yyn])) - { - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) - { - yycount = 1; - yysize = yysize0; - break; - } - yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (0, yytname[yyx]); - if (! (yysize <= yysize1 - && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; - } - } - } + int yyn = yypact[yystate]; - switch (yycount) + if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) + return 0; + else { -# define YYCASE_(N, S) \ - case N: \ - yyformat = S; \ - break - YYCASE_(0, YY_("syntax error")); - YYCASE_(1, YY_("syntax error, unexpected %s")); - YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); - YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); - YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); - YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); -# undef YYCASE_ - } + int yytype = YYTRANSLATE (yychar); + YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); + YYSIZE_T yysize = yysize0; + YYSIZE_T yysize1; + int yysize_overflow = 0; + enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; + char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; + int yyx; + +# if 0 + /* This is so xgettext sees the translatable formats that are + constructed on the fly. */ + YY_("syntax error, unexpected %s"); + YY_("syntax error, unexpected %s, expecting %s"); + YY_("syntax error, unexpected %s, expecting %s or %s"); + YY_("syntax error, unexpected %s, expecting %s or %s or %s"); + YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); +# endif + char *yyfmt; + char const *yyf; + static char const yyunexpected[] = "syntax error, unexpected %s"; + static char const yyexpecting[] = ", expecting %s"; + static char const yyor[] = " or %s"; + char yyformat[sizeof yyunexpected + + sizeof yyexpecting - 1 + + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) + * (sizeof yyor - 1))]; + char const *yyprefix = yyexpecting; + + /* Start YYX at -YYN if negative to avoid negative indexes in + YYCHECK. */ + int yyxbegin = yyn < 0 ? -yyn : 0; + + /* Stay within bounds of both yycheck and yytname. */ + int yychecklim = YYLAST - yyn + 1; + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; + int yycount = 1; + + yyarg[0] = yytname[yytype]; + yyfmt = yystpcpy (yyformat, yyunexpected); + + for (yyx = yyxbegin; yyx < yyxend; ++yyx) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) + { + if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) + { + yycount = 1; + yysize = yysize0; + yyformat[sizeof yyunexpected - 1] = '\0'; + break; + } + yyarg[yycount++] = yytname[yyx]; + yysize1 = yysize + yytnamerr (0, yytname[yyx]); + yysize_overflow |= (yysize1 < yysize); + yysize = yysize1; + yyfmt = yystpcpy (yyfmt, yyprefix); + yyprefix = yyor; + } - yysize1 = yysize + yystrlen (yyformat); - if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; + yyf = YY_(yyformat); + yysize1 = yysize + yystrlen (yyf); + yysize_overflow |= (yysize1 < yysize); + yysize = yysize1; - if (*yymsg_alloc < yysize) - { - *yymsg_alloc = 2 * yysize; - if (! (yysize <= *yymsg_alloc - && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM)) - *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM; - return 1; - } + if (yysize_overflow) + return YYSIZE_MAXIMUM; - /* Avoid sprintf, as that infringes on the user's name space. - Don't have undefined behavior even if the translation - produced a string with the wrong number of "%s"s. */ - { - char *yyp = *yymsg; - int yyi = 0; - while ((*yyp = *yyformat) != '\0') - if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount) - { - yyp += yytnamerr (yyp, yyarg[yyi++]); - yyformat += 2; - } - else - { - yyp++; - yyformat++; - } - } - return 0; + if (yyresult) + { + /* Avoid sprintf, as that infringes on the user's name space. + Don't have undefined behavior even if the translation + produced a string with the wrong number of "%s"s. */ + char *yyp = yyresult; + int yyi = 0; + while ((*yyp = *yyf) != '\0') + { + if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) + { + yyp += yytnamerr (yyp, yyarg[yyi++]); + yyf += 2; + } + else + { + yyp++; + yyf++; + } + } + } + return yysize; + } } #endif /* YYERROR_VERBOSE */ + /*-----------------------------------------------. | Release the memory associated to this symbol. | @@ -1253,7 +1212,6 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, context) } } - /* Prevent warnings from -Wmissing-prototypes. */ #ifdef YYPARSE_PARAM #if defined __STDC__ || defined __cplusplus @@ -1270,9 +1228,12 @@ int yyparse (); #endif /* ! YYPARSE_PARAM */ -/*----------. -| yyparse. | -`----------*/ + + + +/*-------------------------. +| yyparse or yypush_parse. | +`-------------------------*/ #ifdef YYPARSE_PARAM #if (defined __STDC__ || defined __C99__FUNC__ \ @@ -1336,7 +1297,7 @@ YYLTYPE yylloc; YYLTYPE *yylsp; /* The locations where the error started and ended. */ - YYLTYPE yyerror_range[3]; + YYLTYPE yyerror_range[2]; YYSIZE_T yystacksize; @@ -1383,7 +1344,7 @@ YYLTYPE yylloc; yyvsp = yyvs; yylsp = yyls; -#if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL +#if YYLTYPE_IS_TRIVIAL /* Initialize the default location before parsing starts. */ yylloc.first_line = yylloc.last_line = 1; yylloc.first_column = yylloc.last_column = 1; @@ -1485,7 +1446,7 @@ yybackup: /* First try to decide what to do without reference to lookahead token. */ yyn = yypact[yystate]; - if (yypact_value_is_default (yyn)) + if (yyn == YYPACT_NINF) goto yydefault; /* Not known => get a lookahead token if don't already have one. */ @@ -1516,8 +1477,8 @@ yybackup: yyn = yytable[yyn]; if (yyn <= 0) { - if (yytable_value_is_error (yyn)) - goto yyerrlab; + if (yyn == 0 || yyn == YYTABLE_NINF) + goto yyerrlab; yyn = -yyn; goto yyreduce; } @@ -1573,7 +1534,7 @@ yyreduce: { case 7: -/* Line 1806 of yacc.c */ +/* Line 1455 of yacc.c */ #line 117 "config_parser.yy" { m_Abstract = false; @@ -1583,7 +1544,7 @@ yyreduce: case 8: -/* Line 1806 of yacc.c */ +/* Line 1455 of yacc.c */ #line 122 "config_parser.yy" { m_Object = boost::make_shared((yyvsp[(4) - (5)].text), (yyvsp[(5) - (5)].text), yylloc); @@ -1594,7 +1555,7 @@ yyreduce: case 9: -/* Line 1806 of yacc.c */ +/* Line 1455 of yacc.c */ #line 128 "config_parser.yy" { Object::Ptr exprl_object = *(yyvsp[(8) - (8)].variant); @@ -1625,7 +1586,7 @@ yyreduce: case 12: -/* Line 1806 of yacc.c */ +/* Line 1455 of yacc.c */ #line 160 "config_parser.yy" { m_Abstract = true; @@ -1634,7 +1595,7 @@ yyreduce: case 13: -/* Line 1806 of yacc.c */ +/* Line 1455 of yacc.c */ #line 164 "config_parser.yy" { m_Temporary = true; @@ -1643,7 +1604,7 @@ yyreduce: case 14: -/* Line 1806 of yacc.c */ +/* Line 1455 of yacc.c */ #line 168 "config_parser.yy" { m_Local = true; @@ -1652,7 +1613,7 @@ yyreduce: case 17: -/* Line 1806 of yacc.c */ +/* Line 1455 of yacc.c */ #line 178 "config_parser.yy" { m_Object->AddParent((yyvsp[(1) - (1)].text)); @@ -1662,7 +1623,7 @@ yyreduce: case 20: -/* Line 1806 of yacc.c */ +/* Line 1455 of yacc.c */ #line 189 "config_parser.yy" { m_ExpressionLists.push(boost::make_shared()); @@ -1671,7 +1632,7 @@ yyreduce: case 21: -/* Line 1806 of yacc.c */ +/* Line 1455 of yacc.c */ #line 194 "config_parser.yy" { (yyval.variant) = new Variant(m_ExpressionLists.top()); @@ -1681,7 +1642,7 @@ yyreduce: case 27: -/* Line 1806 of yacc.c */ +/* Line 1455 of yacc.c */ #line 209 "config_parser.yy" { Expression expr((yyvsp[(1) - (3)].text), (yyvsp[(2) - (3)].op), *(yyvsp[(3) - (3)].variant), yylloc); @@ -1694,7 +1655,7 @@ yyreduce: case 28: -/* Line 1806 of yacc.c */ +/* Line 1455 of yacc.c */ #line 217 "config_parser.yy" { Expression subexpr((yyvsp[(3) - (6)].text), (yyvsp[(5) - (6)].op), *(yyvsp[(6) - (6)].variant), yylloc); @@ -1713,7 +1674,7 @@ yyreduce: case 29: -/* Line 1806 of yacc.c */ +/* Line 1455 of yacc.c */ #line 231 "config_parser.yy" { Expression expr((yyvsp[(1) - (1)].text), OperatorSet, (yyvsp[(1) - (1)].text), yylloc); @@ -1725,7 +1686,7 @@ yyreduce: case 34: -/* Line 1806 of yacc.c */ +/* Line 1455 of yacc.c */ #line 244 "config_parser.yy" { (yyval.op) = (yyvsp[(1) - (1)].op); @@ -1734,7 +1695,7 @@ yyreduce: case 35: -/* Line 1806 of yacc.c */ +/* Line 1455 of yacc.c */ #line 250 "config_parser.yy" { (yyval.variant) = new Variant((yyvsp[(1) - (1)].text)); @@ -1744,7 +1705,7 @@ yyreduce: case 36: -/* Line 1806 of yacc.c */ +/* Line 1455 of yacc.c */ #line 255 "config_parser.yy" { (yyval.variant) = new Variant((yyvsp[(1) - (1)].num)); @@ -1753,7 +1714,7 @@ yyreduce: case 37: -/* Line 1806 of yacc.c */ +/* Line 1455 of yacc.c */ #line 259 "config_parser.yy" { (yyval.variant) = new Variant(); @@ -1762,7 +1723,7 @@ yyreduce: case 40: -/* Line 1806 of yacc.c */ +/* Line 1455 of yacc.c */ #line 267 "config_parser.yy" { (yyval.variant) = (yyvsp[(1) - (1)].variant); @@ -1771,7 +1732,7 @@ yyreduce: case 41: -/* Line 1806 of yacc.c */ +/* Line 1455 of yacc.c */ #line 273 "config_parser.yy" { m_Array = boost::make_shared(); @@ -1780,7 +1741,7 @@ yyreduce: case 42: -/* Line 1806 of yacc.c */ +/* Line 1455 of yacc.c */ #line 278 "config_parser.yy" { (yyval.variant) = new Variant(m_Array); @@ -1790,7 +1751,7 @@ yyreduce: case 43: -/* Line 1806 of yacc.c */ +/* Line 1455 of yacc.c */ #line 285 "config_parser.yy" { m_Array->AddUnnamedProperty(*(yyvsp[(1) - (1)].variant)); @@ -1800,21 +1761,10 @@ yyreduce: -/* Line 1806 of yacc.c */ -#line 1805 "config_parser.cc" +/* Line 1455 of yacc.c */ +#line 1766 "config_parser.cc" default: break; } - /* User semantic actions sometimes alter yychar, and that requires - that yytoken be updated with the new translation. We take the - approach of translating immediately before every use of yytoken. - One alternative is translating here after every semantic action, - but that translation would be missed if the semantic action invokes - YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or - if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an - incorrect destructor might then be invoked immediately. In the - case of YYERROR or YYBACKUP, subsequent parser actions might lead - to an incorrect destructor call or verbose syntax error message - before the lookahead is translated. */ YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); YYPOPSTACK (yylen); @@ -1843,10 +1793,6 @@ yyreduce: | yyerrlab -- here on detecting error | `------------------------------------*/ yyerrlab: - /* Make sure we have latest lookahead translation. See comments at - user semantic actions for why this is necessary. */ - yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar); - /* If not already recovering from an error, report this error. */ if (!yyerrstatus) { @@ -1854,40 +1800,41 @@ yyerrlab: #if ! YYERROR_VERBOSE yyerror (&yylloc, context, YY_("syntax error")); #else -# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \ - yyssp, yytoken) { - char const *yymsgp = YY_("syntax error"); - int yysyntax_error_status; - yysyntax_error_status = YYSYNTAX_ERROR; - if (yysyntax_error_status == 0) - yymsgp = yymsg; - else if (yysyntax_error_status == 1) - { - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); - yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc); - if (!yymsg) - { - yymsg = yymsgbuf; - yymsg_alloc = sizeof yymsgbuf; - yysyntax_error_status = 2; - } - else - { - yysyntax_error_status = YYSYNTAX_ERROR; - yymsgp = yymsg; - } - } - yyerror (&yylloc, context, yymsgp); - if (yysyntax_error_status == 2) - goto yyexhaustedlab; + YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); + if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) + { + YYSIZE_T yyalloc = 2 * yysize; + if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) + yyalloc = YYSTACK_ALLOC_MAXIMUM; + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); + yymsg = (char *) YYSTACK_ALLOC (yyalloc); + if (yymsg) + yymsg_alloc = yyalloc; + else + { + yymsg = yymsgbuf; + yymsg_alloc = sizeof yymsgbuf; + } + } + + if (0 < yysize && yysize <= yymsg_alloc) + { + (void) yysyntax_error (yymsg, yystate, yychar); + yyerror (&yylloc, context, yymsg); + } + else + { + yyerror (&yylloc, context, YY_("syntax error")); + if (yysize != 0) + goto yyexhaustedlab; + } } -# undef YYSYNTAX_ERROR #endif } - yyerror_range[1] = yylloc; + yyerror_range[0] = yylloc; if (yyerrstatus == 3) { @@ -1924,7 +1871,7 @@ yyerrorlab: if (/*CONSTCOND*/ 0) goto yyerrorlab; - yyerror_range[1] = yylsp[1-yylen]; + yyerror_range[0] = yylsp[1-yylen]; /* Do not reclaim the symbols of the rule which action triggered this YYERROR. */ YYPOPSTACK (yylen); @@ -1943,7 +1890,7 @@ yyerrlab1: for (;;) { yyn = yypact[yystate]; - if (!yypact_value_is_default (yyn)) + if (yyn != YYPACT_NINF) { yyn += YYTERROR; if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) @@ -1958,7 +1905,7 @@ yyerrlab1: if (yyssp == yyss) YYABORT; - yyerror_range[1] = *yylsp; + yyerror_range[0] = *yylsp; yydestruct ("Error: popping", yystos[yystate], yyvsp, yylsp, context); YYPOPSTACK (1); @@ -1968,10 +1915,10 @@ yyerrlab1: *++yyvsp = yylval; - yyerror_range[2] = yylloc; + yyerror_range[1] = yylloc; /* Using YYLLOC is tempting, but would change the location of the lookahead. YYLOC is available though. */ - YYLLOC_DEFAULT (yyloc, yyerror_range, 2); + YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2); *++yylsp = yyloc; /* Shift the error token. */ @@ -2007,13 +1954,8 @@ yyexhaustedlab: yyreturn: if (yychar != YYEMPTY) - { - /* Make sure we have latest lookahead translation. See comments at - user semantic actions for why this is necessary. */ - yytoken = YYTRANSLATE (yychar); - yydestruct ("Cleanup: discarding lookahead", - yytoken, &yylval, &yylloc, context); - } + yydestruct ("Cleanup: discarding lookahead", + yytoken, &yylval, &yylloc, context); /* Do not reclaim the symbols of the rule which action triggered this YYABORT or YYACCEPT. */ YYPOPSTACK (yylen); @@ -2038,7 +1980,7 @@ yyreturn: -/* Line 2067 of yacc.c */ +/* Line 1675 of yacc.c */ #line 298 "config_parser.yy" diff --git a/dyn/config_parser.h b/dyn/config_parser.h index 4ac314b8c..ec90fecf1 100644 --- a/dyn/config_parser.h +++ b/dyn/config_parser.h @@ -1,8 +1,10 @@ -/* A Bison parser, made by GNU Bison 2.5. */ -/* Bison interface for Yacc-like parsers in C +/* A Bison parser, made by GNU Bison 2.4.1. */ + +/* Skeleton interface for Bison's Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -32,7 +34,7 @@ /* "%code requires" blocks. */ -/* Line 2068 of yacc.c */ +/* Line 1676 of yacc.c */ #line 1 "config_parser.yy" /****************************************************************************** @@ -63,8 +65,8 @@ using namespace icinga; -/* Line 2068 of yacc.c */ -#line 68 "config_parser.h" +/* Line 1676 of yacc.c */ +#line 70 "config_parser.h" /* Tokens. */ #ifndef YYTOKENTYPE @@ -113,7 +115,7 @@ using namespace icinga; typedef union YYSTYPE { -/* Line 2068 of yacc.c */ +/* Line 1676 of yacc.c */ #line 38 "config_parser.yy" char *text; @@ -123,8 +125,8 @@ typedef union YYSTYPE -/* Line 2068 of yacc.c */ -#line 128 "config_parser.h" +/* Line 1676 of yacc.c */ +#line 130 "config_parser.h" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ diff --git a/icinga/Makefile.am b/icinga/Makefile.am index aaade88d0..5a2a64738 100644 --- a/icinga/Makefile.am +++ b/icinga/Makefile.am @@ -21,6 +21,8 @@ libicinga_la_SOURCES = \ icingaapplication.h \ host.cpp \ host.h \ + hostgroup.cpp \ + hostgroup.h \ i2-icinga.h \ jsonrpcendpoint.cpp \ jsonrpcendpoint.h \ @@ -30,6 +32,8 @@ libicinga_la_SOURCES = \ nagioschecktask.h \ service.cpp \ service.h \ + servicegroup.cpp \ + servicegroup.h \ virtualendpoint.cpp \ virtualendpoint.h diff --git a/icinga/host.cpp b/icinga/host.cpp index d9a996363..cfda2796a 100644 --- a/icinga/host.cpp +++ b/icinga/host.cpp @@ -2,17 +2,22 @@ using namespace icinga; -string Host::GetDisplayName(void) const +string Host::GetAlias(void) const { string value; - if (GetConfigObject()->GetProperty("displayname", &value)) + if (GetConfigObject()->GetProperty("alias", &value)) return value; return GetName(); } -Host Host::GetByName(string name) +bool Host::Exists(const string& name) +{ + return (ConfigObject::GetObject("host", name)); +} + +Host Host::GetByName(const string& name) { ConfigObject::Ptr configObject = ConfigObject::GetObject("host", name); @@ -21,3 +26,10 @@ Host Host::GetByName(string name) return Host(configObject); } + +Dictionary::Ptr Host::GetGroups(void) const +{ + Dictionary::Ptr value; + GetConfigObject()->GetProperty("hostgroups", &value); + return value; +} diff --git a/icinga/host.h b/icinga/host.h index 18331a730..6db8b4f41 100644 --- a/icinga/host.h +++ b/icinga/host.h @@ -11,9 +11,11 @@ public: : ConfigObjectAdapter(configObject) { } - static Host GetByName(string name); + static bool Exists(const string& name); + static Host GetByName(const string& name); - string GetDisplayName(void) const; + string GetAlias(void) const; + Dictionary::Ptr GetGroups(void) const; }; } diff --git a/icinga/i2-icinga.h b/icinga/i2-icinga.h index 35dd1bf1c..8794751b2 100644 --- a/icinga/i2-icinga.h +++ b/icinga/i2-icinga.h @@ -48,7 +48,9 @@ using boost::algorithm::is_any_of; #include "configobjectadapter.h" #include "host.h" +#include "hostgroup.h" #include "service.h" +#include "servicegroup.h" #include "cib.h" diff --git a/icinga/service.cpp b/icinga/service.cpp index 5f498fe47..246ebee11 100644 --- a/icinga/service.cpp +++ b/icinga/service.cpp @@ -12,6 +12,11 @@ string Service::GetAlias(void) const return GetName(); } +bool Service::Exists(const string& name) +{ + return (ConfigObject::GetObject("service", name)); +} + Service Service::GetByName(const string& name) { ConfigObject::Ptr configObject = ConfigObject::GetObject("service", name); @@ -86,6 +91,13 @@ Dictionary::Ptr Service::GetDependencies(void) const return value; } +Dictionary::Ptr Service::GetGroups(void) const +{ + Dictionary::Ptr value; + GetConfigObject()->GetProperty("servicegroups", &value); + return value; +} + void Service::SetNextCheck(time_t nextCheck) { GetConfigObject()->SetTag("next_check", (long)nextCheck); diff --git a/icinga/service.h b/icinga/service.h index 2bbe6663d..4f144bf59 100644 --- a/icinga/service.h +++ b/icinga/service.h @@ -29,6 +29,7 @@ public: : ConfigObjectAdapter(configObject) { } + static bool Exists(const string& name); static Service GetByName(const string& name); string GetAlias(void) const; @@ -40,6 +41,7 @@ public: long GetCheckInterval(void) const; long GetRetryInterval(void) const; Dictionary::Ptr GetDependencies(void) const; + Dictionary::Ptr GetGroups(void) const; void SetNextCheck(time_t nextCheck); time_t GetNextCheck(void);