Commit f87dd9bc authored by Alexander Wirt's avatar Alexander Wirt

Imported Upstream version 1.11.4

parent 8e899cb4
......@@ -20,18 +20,25 @@ NEWS
* Mailinglists have been migrated to icinga.org. Please check https://www.icinga.org/support for details!
1.12.0
1.11.4 - 28/05/2014
ENHANCEMENTS
FIXES
* classic ui: start with unhandled problems view instead of TAC #4817 - MF
* core: Icinga should warn about deprecated configuration objects and attributes #6075 - MF
* core: Fix config parser with object custom variables #6330 - MF
* core: Allow Classic UI config parser to ignore unknown objects #5826 - MF
FIXES
* classic ui: Fix jquery.dd source file, update to 2.38 #6324 - MF
CHANGES
* classic ui: start with unhandled problems view instead of TAC #4817
** can be overridden on configure using '--with-mainurl='
* config parser now marks the following attributes and objects as DEPRECATED (they have been since 0.8.0)
** retry_check_interval (hosts, services)
** normal_check_internal (hosts, services)
** checks_enabled (hosts)
** hostextinfo object
** serviceextinfo object
1.11.3 - 10/05/2014
......
......@@ -88,7 +88,7 @@ MKDIR=/bin/mkdir
###############################
# Global
###############################
ICINGA_VERSION=1.11.3
ICINGA_VERSION=1.11.4
CP=@CP@
......
......@@ -2507,9 +2507,9 @@ ac_config_headers="$ac_config_headers include/config.h"
PKG_NAME=icinga-core
PKG_VERSION="1.11.3"
PKG_VERSION="1.11.4"
PKG_HOME_URL="http://www.icinga.org/"
PKG_REL_DATE="05-10-2014"
PKG_REL_DATE="05-28-2014"
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
......@@ -6329,7 +6329,7 @@ fi
if test "${with_mainurl+set}" = set; then :
withval=$with_mainurl; mainurl=$withval
else
mainurl=$cgiurl/status.cgi?allunhandledproblems
mainurl=$cgiurl/tac.cgi
fi
......
......@@ -9,9 +9,9 @@ AC_CONFIG_HEADER(include/config.h)
AC_PREFIX_DEFAULT(/usr/local/icinga)
PKG_NAME=icinga-core
PKG_VERSION="1.11.3"
PKG_VERSION="1.11.4"
PKG_HOME_URL="http://www.icinga.org/"
PKG_REL_DATE="05-10-2014"
PKG_REL_DATE="05-28-2014"
dnl Figure out how to invoke "install" and what install options to use.
AC_PROG_INSTALL
......@@ -802,7 +802,7 @@ AC_ARG_WITH(cgiurl,AC_HELP_STRING([--with-cgiurl=<local-url>],[sets URL for cgi
AC_SUBST(cgiurl)
AC_ARG_WITH(htmurl,AC_HELP_STRING([--with-htmurl=<local-url>],[sets URL for public html]),htmurl=$withval,htmurl=/icinga)
AC_SUBST(htmurl)
AC_ARG_WITH(mainurl,AC_HELP_STRING([--with-mainurl=<local-url>],[sets URL for default main frame in index.html (use quotes if special chars like & used)]),mainurl=$withval,mainurl=$cgiurl/status.cgi?allunhandledproblems)
AC_ARG_WITH(mainurl,AC_HELP_STRING([--with-mainurl=<local-url>],[sets URL for default main frame in index.html (use quotes if special chars like & used)]),mainurl=$withval,mainurl=$cgiurl/tac.cgi)
AC_SUBST(mainurl)
USE_NANOSLEEP=yes
......
This diff is collapsed.
// MSDropDown - jquery.dd.js
// author: Marghoob Suleman - Search me on google
// Date: 12th Aug, 2009, {18 Dec, 2010 (2.36)}, {date: 02 July, 2011}
// Version: 2.38
// Revision: 35
// web: www.giftlelo.com | www.marghoobsuleman.com
/*
// msDropDown is free jQuery Plugin: you can redistribute it and/or modify
// it under the terms of the either the MIT License or the Gnu General Public License (GPL) Version 2
*/
;eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}(';(5($){3 1N="";3 3A=5(s,u){3 v=s;3 x=1b;3 u=$.3B({1c:4s,2w:7,2S:23,1O:6,1P:4t,3C:\'2f\',1J:14,3D:\'4u\',2T:\'\',2U:6,1k:\'\'},u);1b.1Z=21 3E();3 y="";3 z={};z.2V=6;z.2x=14;z.2y=1s;3 A=14;3 B={2W:\'4v\',1Q:\'4w\',1K:\'4x\',2g:\'4y\',1f:\'4z\',2X:\'4A\',2Y:\'4B\',4C:\'4D\',2z:\'4E\',3F:\'4F\'};3 C={2f:u.3C,2Z:\'2Z\',31:\'31\',32:\'32\',1x:\'1x\',1l:.30,1R:\'1R\',2A:\'2A\',2B:\'2B\',15:\'15\'};3 D={3G:"2C,33,34,1S,2D,2E,1t,1C,2F,1T,4G,22,35",1a:"1D,1y,1l,4H"};1b.1U=21 3E();3 E=$(v).1a("1d");4(1i(E)=="11"||E.18<=0){E="4I"+$.1V.3H++;$(v).2h("1d",E)};3 F=$(v).1a("1k");u.1k+=(F==11)?"":F;3 G=$(v).3I();A=($(v).1a("1D")>1||$(v).1a("1y")==6)?6:14;4(A){u.2w=$(v).1a("1D")};3 H={};3 I=0;3 J=14;3 K;3 L={};3 M="";3 N=5(a){4(1i(L[a])=="11"){L[a]=1o.4J(a)}12 L[a]};3 O=5(a){12 E+B[a]};3 P=5(a){3 b=a;3 c=$(b).1a("1k");12(1i c=="11")?"":c.4K};3 Q=5(a){3 b=$("#"+E+" 36:15");4(b.18>1){1E(3 i=0;i<b.18;i++){4(a==b[i].1j){12 6}}}19 4(b.18==1){4(b[0].1j==a){12 6}};12 14};3 R=5(a,b,c,d){3 e="";3 f=(d=="3a")?O("2Y"):O("2X");3 g=(d=="3a")?f+"3b"+(b)+"3b"+(c):f+"3b"+(b);3 h="";3 t="";3 i="";3 j="";4(u.1J!=14){i=\' \'+u.1J+\' \'+a.3J}19{h=$(a).1a("1p");3 k=21 3K(/^\\{.*\\}$/);3 l=k.3L(h);4(u.2U==6&&l==6){4(h.18!=0){3 m=24("["+h+"]");1W=(1i m[0].2i=="11")?"":m[0].2i;t=(1i m[0].1p=="11")?"":m[0].1p;j=(1i m[0].3M=="11")?"":m[0].3M;h=(1W.18==0)?"":\'<1W 2G="\'+1W+\'" 2H="2I" /> \'}}19{h=(h.18==0)?"":\'<1W 2G="\'+h+\'" 2H="2I" /> \'}};3 n=$(a).1u();3 o=$(a).4L();3 p=($(a).1a("1l")==6)?"1l":"3c";H[g]={1L:h+n,2j:o,1u:n,1j:a.1j,1d:g,1p:t};3 q=P(a);4(Q(a.1j)==6){e+=\'<a 3N="3O:3P(0);" 1v="\'+C.15+\' \'+p+i+\'"\'}19{e+=\'<a 3N="3O:3P(0);" 1v="\'+p+i+\'"\'};4(q!==14&&q!==11&&q.18!=0){e+=" 1k=\'"+q+"\'"};4(t!==""){e+=" 1p=\'"+t+"\'"};e+=\' 1d="\'+g+\'">\';e+=h+\'<1z 1v="\'+C.1x+\'">\'+n+\'</1z>\';4(j!==""){e+=j};e+=\'</a>\';12 e};3 S=5(t){3 b=t.3d();4(b.18==0)12-1;3 a="";1E(3 i 2k H){3 c=H[i].1u.3d();4(c.3Q(0,b.18)==b){a+="#"+H[i].1d+", "}};12(a=="")?-1:a};3 T=5(){3 f=G;4(f.18==0)12"";3 g="";3 h=O("2X");3 i=O("2Y");f.3e(5(c){3 d=f[c];4(d.4M.4N().3d()=="4O"){g+="<1A 1v=\'4P\'>";g+="<1z 1k=\'3R-4Q:4R;3R-1k:4S;4T:4U;\'>"+$(d).1a("4V")+"</1z>";3 e=$(d).3I();e.3e(5(a){3 b=e[a];g+=R(b,c,a,"3a")});g+="</1A>"}19{g+=R(d,c,"","")}});12 g};3 U=5(){3 a=O("1Q");3 b=O("1f");3 c=u.1k;25="";25+=\'<1A 1d="\'+b+\'" 1v="\'+C.32+\'"\';4(!A){25+=(c!="")?\' 1k="\'+c+\'"\':\'\'}19{25+=(c!="")?\' 1k="2J-1q:4W 4X #4Y;1r:2l;1m:2K;\'+c+\'"\':\'\'};25+=\'>\';12 25};3 V=5(){3 a=O("1K");3 b=O("2z");3 c=O("2g");3 d=O("3F");3 e="";3 f="";4(N(E).1F.18>0){e=$("#"+E+" 36:15").1u();f=$("#"+E+" 36:15").1a("1p")};3 g="";3 t="";3 h=21 3K(/^\\{.*\\}$/);3 i=h.3L(f);4(u.2U==6&&i==6){4(f.18!=0){3 j=24("["+f+"]");g=(1i j[0].2i=="11")?"":j[0].2i;t=(1i j[0].1p=="11")?"":j[0].1p;f=(g.18==0||u.1O==14||u.1J!=14)?"":\'<1W 2G="\'+g+\'" 2H="2I" /> \'}}19{f=(f.18==0||f==11||u.1O==14||u.1J!=14)?"":\'<1W 2G="\'+f+\'" 2H="2I" /> \'};3 k=\'<1A 1d="\'+a+\'" 1v="\'+C.2Z+\'"\';k+=\'>\';k+=\'<1z 1d="\'+b+\'" 1v="\'+C.31+\'"></1z><1z 1v="\'+C.1x+\'" 1d="\'+c+\'">\'+f+\'<1z 1v="\'+C.1x+\'">\'+e+\'</1z></1z></1A>\';12 k};3 W=5(){3 c=O("1f");$("#"+c+" a.3c").1G("1S");$("#"+c+" a.3c").1e("1S",5(a){a.26();Z(1b);28();4(!A){$("#"+c).1G("1C");29(14);3 b=(u.1O==14)?$(1b).1u():$(1b).1L();1X(b);x.2m()}})};3 X=5(){3 d=14;3 e=O("1Q");3 f=O("1K");3 g=O("2g");3 h=O("1f");3 i=O("2z");3 j=$("#"+E).4Z();3 k=u.1k;4($("#"+e).18>0){$("#"+e).2L();d=6};3 l=\'<1A 1d="\'+e+\'" 1v="\'+C.2f+\'"\';l+=(k!="")?\' 1k="\'+k+\'"\':\'\';l+=\'>\';l+=V();l+=U();l+=T();l+="</1A>";l+="</1A>";4(d==6){3 m=O("2W");$("#"+m).3f(l)}19{$("#"+E).3f(l)};4(A){3 f=O("1K");$("#"+f).2n()};$("#"+e).9("3S",j+"1w");$("#"+h).9("3S",(j-2)+"1w");4(G.18>u.2w){3 n=2o($("#"+h+" a:3g").9("2p-3T"))+2o($("#"+h+" a:3g").9("2p-1q"));3 o=((u.2S)*u.2w)-n;$("#"+h).9("1c",o+"1w")}19 4(A){3 o=$("#"+E).1c();$("#"+h).9("1c",o+"1w")};4(d==14){3U();3V(E)};4($("#"+E).1a("1l")==6){$("#"+e).9("2M",C.1l)};3W();$("#"+f).1e("1C",5(a){3h(1)});$("#"+f).1e("1T",5(a){3h(0)});W();$("#"+h+" a.1l").9("2M",C.1l);4(A){$("#"+h).1e("1C",5(c){4(!z.2x){z.2x=6;$(1o).1e("22",5(a){3 b=a.3X;z.2y=b;4(b==39||b==40){a.26();a.2q();3i();28()};4(b==37||b==38){a.26();a.2q();3j();28()}})}})};$("#"+h).1e("1T",5(a){29(14);$(1o).1G("22",2N);z.2x=14;z.2y=1s});$("#"+f).1e("1S",5(b){29(14);4($("#"+h+":2r").18==1){$("#"+h).1G("1C")}19{$("#"+h).1e("1C",5(a){29(6)});x.3Y()}});$("#"+f).1e("1T",5(a){29(14)});4(u.1O&&u.1J!=14){2s()}};3 Y=5(a){1E(3 i 2k H){4(H[i].1j==a){12 H[i]}};12-1};3 Z=5(a){3 b=O("1f");4($("#"+b+" a."+C.15).18==1){y=$("#"+b+" a."+C.15).1u()};4(!A){$("#"+b+" a."+C.15).1M(C.15)};3 c=$("#"+b+" a."+C.15).1a("1d");4(c!=11){3 d=(z.2a==11||z.2a==1s)?H[c].1j:z.2a};4(a&&!A){$(a).1H(C.15)};4(A){3 e=z.2y;4($("#"+E).1a("1y")==6){4(e==17){z.2a=H[$(a).1a("1d")].1j;$(a).50(C.15)}19 4(e==16){$("#"+b+" a."+C.15).1M(C.15);$(a).1H(C.15);3 f=$(a).1a("1d");3 g=H[f].1j;1E(3 i=3k.51(d,g);i<=3k.52(d,g);i++){$("#"+Y(i).1d).1H(C.15)}}19{$("#"+b+" a."+C.15).1M(C.15);$(a).1H(C.15);z.2a=H[$(a).1a("1d")].1j}}19{$("#"+b+" a."+C.15).1M(C.15);$(a).1H(C.15);z.2a=H[$(a).1a("1d")].1j}}};3 3V=5(a){3 b=a;N(b).53=5(e){$("#"+b).1V(u)}};3 29=5(a){z.2V=a};3 3Z=5(){12 z.2V};3 3W=5(){3 b=O("1Q");3 c=D.3G.54(",");1E(3 d=0;d<c.18;d++){3 e=c[d];3 f=2b(e);4(f==6){2O(e){1g"2C":$("#"+b).1e("55",5(a){N(E).2C()});1h;1g"1S":$("#"+b).1e("1S",5(a){$("#"+E).1I("1S")});1h;1g"2D":$("#"+b).1e("2D",5(a){$("#"+E).1I("2D")});1h;1g"2E":$("#"+b).1e("2E",5(a){$("#"+E).1I("2E")});1h;1g"1t":$("#"+b).1e("1t",5(a){$("#"+E).1I("1t")});1h;1g"1C":$("#"+b).1e("1C",5(a){$("#"+E).1I("1C")});1h;1g"2F":$("#"+b).1e("2F",5(a){$("#"+E).1I("2F")});1h;1g"1T":$("#"+b).1e("1T",5(a){$("#"+E).1I("1T")});1h}}}};3 3U=5(){3 a=O("2W");$("#"+E).3f("<1A 1v=\'"+C.1R+"\' 1k=\'1c:3l;41:42;1m:2P;\' 1d=\'"+a+"\'></1A>");$("#"+E).56($("#"+a))};3 1X=5(a){3 b=O("2g");$("#"+b).1L(a)};3 3m=5(w){3 a=w;3 b=O("1f");3 c=$("#"+b+" a:2r");3 d=c.18;3 e=$("#"+b+" a:2r").1j($("#"+b+" a.15:2r"));3 f;2O(a){1g"3n":4(e<d-1){e++;f=c[e]};1h;1g"43":4(e<d&&e>0){e--;f=c[e]};1h};4(1i(f)=="11"){12 14};$("#"+b+" a."+C.15).1M(C.15);$(f).1H(C.15);3 g=f.1d;4(!A){3 h=(u.1O==14)?H[g].1u:$("#"+g).1L();1X(h);2s(H[g].1j)};4(a=="3n"){4(2o(($("#"+g).1m().1q+$("#"+g).1c()))>=2o($("#"+b).1c())){$("#"+b).2t(($("#"+b).2t())+$("#"+g).1c()+$("#"+g).1c())}}19{4(2o(($("#"+g).1m().1q+$("#"+g).1c()))<=0){$("#"+b).2t(($("#"+b).2t()-$("#"+b).1c())-$("#"+g).1c())}}};3 3i=5(){3m("3n")};3 3j=5(){3m("43")};3 2s=5(i){4(u.1J!=14){3 a=O("2g");3 b=(1i(i)=="11")?N(E).1n:i;3 c=N(E).1F[b].3J;4(c.18>0){3 d=O("1f");3 e=$("#"+d+" a."+c).1a("1d");3 f=$("#"+e).9("1Y-2i");3 g=$("#"+e).9("1Y-1m");4(g==11){g=$("#"+e).9("1Y-1m-x")+" "+$("#"+e).9("1Y-1m-y")};3 h=$("#"+e).9("2p-44");4(f!=11){$("#"+a).2u("."+C.1x).2h(\'1k\',"1Y:"+f)};4(g!=11){$("#"+a).2u("."+C.1x).9(\'1Y-1m\',g)};4(h!=11){$("#"+a).2u("."+C.1x).9(\'2p-44\',h)};$("#"+a).2u("."+C.1x).9(\'1Y-45\',\'57-45\');$("#"+a).2u("."+C.1x).9(\'2p-3T\',\'58\')}}};3 28=5(){3 a=O("1f");3 b=$("#"+a+" a."+C.15);4(b.18==1){3 c=$("#"+a+" a."+C.15).1u();3 d=$("#"+a+" a."+C.15).1a("1d");4(d!=11){3 e=H[d].2j;N(E).1n=H[d].1j};4(u.1O&&u.1J!=14)2s()}19 4(b.18>1){1E(3 i=0;i<b.18;i++){3 d=$(b[i]).1a("1d");3 f=H[d].1j;N(E).1F[f].15="15"}};3 g=N(E).1n;x.1Z["1n"]=g};3 2b=5(a){4($("#"+E).1a("59"+a)!=11){12 6};3 b=$("#"+E).3o("5a");4(b&&b[a]){12 6};12 14};3 3p=5(a){$("#"+E).2C();$("#"+E)[0].33();28();$(1o).1G("1t",2Q);$(1o).1G("1t",3p)};3 47=5(){3 a=O("1f");4(2b(\'34\')==6){3 b=H[$("#"+a+" a.15").1a("1d")].1u;4($.48(y)!==$.48(b)&&y!==""){$("#"+E).1I("34")}};4(2b(\'1t\')==6){$("#"+E).1I("1t")};4(2b(\'33\')==6){$(1o).1e("1t",3p)};12 14};3 3h=5(a){3 b=O("2z");4(a==1)$("#"+b).9({49:\'0 5b%\'});19 $("#"+b).9({49:\'0 0\'})};3 4a=5(){1E(3 i 2k N(E)){4(1i(N(E)[i])!=\'5\'&&N(E)[i]!==11&&N(E)[i]!==1s){x.1B(i,N(E)[i],6)}}};3 4b=5(a,b){4(Y(b)!=-1){N(E)[a]=b;3 c=O("1f");$("#"+c+" a."+C.15).1M(C.15);$("#"+Y(b).1d).1H(C.15);3 d=Y(N(E).1n).1L;1X(d)}};3 4c=5(i,a){4(a==\'d\'){1E(3 b 2k H){4(H[b].1j==i){5c H[b];1h}}};3 c=0;1E(3 b 2k H){H[b].1j=c;c++}};3 2R=5(){3 a=O("1f");3 b=O("1Q");3 c=$("#"+b).5d();3 d=$("#"+b).1c();3 e=$(4d).1c();3 f=$(4d).2t();3 g=$("#"+a).1c();3 h={1P:u.1P,1q:(c.1q+d)+"1w",1r:"2c"};3 i=u.3D;3 j=14;3 k=C.2B;$("#"+a).1M(C.2B);$("#"+a).1M(C.2A);4((e+f)<3k.5e(g+d+c.1q)){3 l=c.1q-g;4((c.1q-g)<0){l=10};h={1P:u.1P,1q:l+"1w",1r:"2c"};i="2d";j=6;k=C.2A};12{3q:j,4e:i,9:h,2J:k}};3 3r=5(){4(x.1U["4f"]!=1s){24(x.1U["4f"])(x)}};3 3s=5(){47();4(x.1U["4g"]!=1s){24(x.1U["4g"])(x)}};3 2N=5(a){3 b=O("1f");3 c=a.3X;4(c==8){a.26();a.2q();M=(M.18==0)?"":M.3Q(0,M.18-1)};2O(c){1g 39:1g 40:a.26();a.2q();3i();1h;1g 37:1g 38:a.26();a.2q();3j();1h;1g 27:1g 13:x.2m();28();1h;4h:4(c>46){M+=5f.5g(c)};3 d=S(M);4(d!=-1){$("#"+b).9({1c:\'5h\'});$("#"+b+" a").2n();$(d).2d();3 e=2R();$("#"+b).9(e.9);$("#"+b).9({1r:\'2l\'})}19{$("#"+b+" a").2d();$("#"+b).9({1c:K+\'1w\'})};1h};4(2b("22")==6){N(E).5i()};12 14};3 2Q=5(a){4(3Z()==14){x.2m()};12 14};3 3t=5(a){4($("#"+E).1a("4i")!=11){N(E).4i()};12 14};1b.3Y=5(){4((x.2e("1l",6)==6)||(x.2e("1F",6).18==0))12;3 a=O("1f");4(1N!=""&&a!=1N){$("#"+1N).4j("3u");$("#"+1N).9({1P:\'0\'})};4($("#"+a).9("1r")=="2c"){y=H[$("#"+a+" a.15").1a("1d")].1u;M="";K=$("#"+a).1c();$("#"+a+" a").2d();$(1o).1e("22",2N);$(1o).1e("35",3t);$(1o).1e("1t",2Q);3 b=2R();$("#"+a).9(b.9);4(b.3q==6){$("#"+a).9({1r:\'2l\'});$("#"+a).1H(b.2J);3r()}19{$("#"+a)[b.4e]("3u",5(){$("#"+a).1H(b.2J);3r()})};4(a!=1N){1N=a}}};1b.2m=5(){3 b=O("1f");4($("#"+b).9("1r")=="2c"){12 14};3 c=$("#"+O("1K")).1m().1q;3 d=2R();J=14;4(d.3q==6){$("#"+b).5j({1c:0,1q:c},5(){$("#"+b).9({1c:K+\'1w\',1r:\'2c\'});3s()})}19{$("#"+b).4j("3u",5(a){3s();$("#"+b).9({1P:\'0\'});$("#"+b).9({1c:K+\'1w\'})})};2s();$(1o).1G("22",2N);$(1o).1G("35",2Q);$(1o).1G("1t",3t)};1b.1n=5(i){4(1i(i)=="11"){12 x.2e("1n")}19{x.1B("1n",i)}};1b.4k=5(a){4(1i(a)=="11"||a==6){$("."+C.1R).5k("1k")}19{$("."+C.1R).2h("1k","1c:3l;41:42;1m:2P")}};1b.1B=5(a,b,c){4(a==11||b==11)4l{4m:"1B 5l 5m?"};x.1Z[a]=b;4(c!=6){2O(a){1g"1n":4b(a,b);1h;1g"1l":x.1l(b,6);1h;1g"1y":N(E)[a]=b;A=($(v).1a("1D")>0||$(v).1a("1y")==6)?6:14;4(A){3 d=$("#"+E).1c();3 f=O("1f");$("#"+f).9("1c",d+"1w");3 g=O("1K");$("#"+g).2n();3 f=O("1f");$("#"+f).9({1r:\'2l\',1m:\'2K\'});W()};1h;1g"1D":N(E)[a]=b;4(b==0){N(E).1y=14};A=($(v).1a("1D")>0||$(v).1a("1y")==6)?6:14;4(b==0){3 g=O("1K");$("#"+g).2d();3 f=O("1f");$("#"+f).9({1r:\'2c\',1m:\'2P\'});3 h="";4(N(E).1n>=0){3 i=Y(N(E).1n);h=i.1L;Z($("#"+i.1d))};1X(h)}19{3 g=O("1K");$("#"+g).2n();3 f=O("1f");$("#"+f).9({1r:\'2l\',1m:\'2K\'})};1h;4h:4n{N(E)[a]=b}4o(e){};1h}}};1b.2e=5(a,b){4(a==11&&b==11){12 x.1Z};4(a!=11&&b==11){12(x.1Z[a]!=11)?x.1Z[a]:1s};4(a!=11&&b!=11){12 N(E)[a]}};1b.2r=5(a){3 b=O("1Q");4(a==6){$("#"+b).2d()}19 4(a==14){$("#"+b).2n()}19{12 $("#"+b).9("1r")}};1b.5n=5(a,b){3 c=a;3 d=c.1u;3 e=(c.2j==11||c.2j==1s)?d:c.2j;3 f=(c["1p"]==11||c["1p"]==1s)?\'\':c["1p"];3 i=(b==11||b==1s)?N(E).1F.18:b;N(E).1F[i]=21 5o(d,e);4(f!=\'\')N(E).1F[i]["1p"]=f;3 g=Y(i);4(g!=-1){3 h=R(N(E).1F[i],i,"","");$("#"+g.1d).1L(h)}19{3 h=R(N(E).1F[i],i,"","");3 j=O("1f");$("#"+j).5p(h);W()}};1b.2L=5(i){N(E).2L(i);4((Y(i))!=-1){$("#"+Y(i).1d).2L();4c(i,\'d\')};4(N(E).18==0){1X("")}19{3 a=Y(N(E).1n).1L;1X(a)};x.1B("1n",N(E).1n)};1b.1l=5(a,b){N(E).1l=a;3 c=O("1Q");4(a==6){$("#"+c).9("2M",C.1l);x.2m()}19 4(a==14){$("#"+c).9("2M",1)};4(b!=6){x.1B("1l",a)}};1b.3v=5(){12(N(E).3v==11)?1s:N(E).3v};1b.3w=5(){4(2v.18==1){12 N(E).3w(2v[0])}19 4(2v.18==2){12 N(E).3w(2v[0],2v[1])}19{4l{4m:"5q 1j 5r 5s!"}}};1b.4p=5(a){12 N(E).4p(a)};1b.1y=5(a){4(1i(a)=="11"){12 x.2e("1y")}19{x.1B("1y",a)}};1b.1D=5(a){4(1i(a)=="11"){12 x.2e("1D")}19{x.1B("1D",a)}};1b.5t=5(a,b){x.1U[a]=b};1b.5u=5(a){24(x.1U[a])(x)};1b.5v=5(r){4(1i r=="11"||r==0){12 14};3 a=O("1f");3 b=$("#"+a+" a:3g").1c();3 c=(b==0)?u.2S:b;3 d=r*c;$("#"+a).9("1c",d+"1w")};3 4q=5(){x.1B("3x",$.1V.3x);x.1B("3y",$.1V.3y)};3 4r=5(){X();4a();4q();4(u.2T!=\'\'){24(u.2T)(x)}};4r()};$.1V={3x:\'2.38\',3y:"5w 5x",3H:20,4k:5(v){4(v==6){$(".1R").9({1c:\'5y\',1m:\'2K\'})}19{$(".1R").9({1c:\'3l\',1m:\'2P\'})}},5z:5(a,b){12 $(a).1V(b).3o("2f")}};$.3z.3B({1V:5(b){12 1b.3e(5(){3 a=21 3A(1b,b);$(1b).3o(\'2f\',a)})}});4(1i($.3z.1a)==\'11\'){$.3z.1a=5(w,v){4(1i v=="11"){12 $(1b).2h(w)};4n{$(1b).2h(w,v)}4o(e){}}}})(5A);',62,347,'|||var|if|function|true|||css||||||||||||||||||||||||||||||||||||||||||||||||||||||undefined|return||false|selected|||length|else|prop|this|height|id|bind|postChildID|case|break|typeof|index|style|disabled|position|selectedIndex|document|title|top|display|null|mouseup|text|class|px|ddTitleText|multiple|span|div|set|mouseover|size|for|options|unbind|addClass|trigger|useSprite|postTitleID|html|removeClass|bA|showIcon|zIndex|postID|ddOutOfVision|click|mouseout|onActions|msDropDown|img|bH|background|ddProp||new|keydown||eval|sDiv|preventDefault||bM|bD|oldIndex|bN|none|show|get|dd|postTitleTextID|attr|image|value|in|block|close|hide|parseInt|padding|stopPropagation|visible|bL|scrollTop|find|arguments|visibleRows|keyboardAction|currentKey|postArrowID|borderTop|noBorderTop|focus|dblclick|mousedown|mousemove|src|align|absmiddle|border|relative|remove|opacity|bX|switch|absolute|bY|bU|rowHeight|onInit|jsonTitle|insideWindow|postElementHolder|postAID|postOPTAID|ddTitle||arrow|ddChild|blur|change|keyup|option||||opt|_|enabled|toLowerCase|each|after|first|bQ|bJ|bK|Math|0px|bI|next|data|bO|opp|bV|bW|bZ|fast|form|item|version|author|fn|bB|extend|mainCSS|animStyle|Object|postInputhidden|actions|counter|children|className|RegExp|test|postHTML|href|javascript|void|substr|font|width|bottom|bG|bC|bF|keyCode|open|bE||overflow|hidden|previous|left|repeat||bP|trim|backgroundPosition|bR|bS|bT|window|ani|onOpen|onClose|default|onkeyup|slideUp|debug|throw|message|try|catch|namedItem|ca|cb|120|9999|slideDown|_msddHolder|_msdd|_title|_titletext|_child|_msa|_msopta|postInputID|_msinput|_arrow|_inp|keypress|tabindex|msdrpdd|getElementById|cssText|val|nodeName|toString|optgroup|opta|weight|bold|italic|clear|both|label|1px|solid|c3c3c3|outerWidth|toggleClass|min|max|refresh|split|mouseenter|appendTo|no|2px|on|events|100|delete|offset|floor|String|fromCharCode|auto|onkeydown|animate|removeAttr|to|what|add|Option|append|An|is|required|addMyEvent|fireEvent|showRows|Marghoob|Suleman|20px|create|jQuery'.split('|'),0,{}));
\ No newline at end of file
......@@ -18,9 +18,9 @@
</div>
<div id="currentversioninfo">
<div class="version">Version 1.11.3</div>
<div class="releasedate">Mai 10, 2014</div>
<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.11.3</a></div>
<div class="version">Version 1.11.4</div>
<div class="releasedate">Mai 28, 2014</div>
<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.11.4</a></div>
</div>
<div id="developer">
......
......@@ -54,7 +54,7 @@
Summary: Open Source host, service and network monitoring program
Name: icinga
Version: 1.11.3
Version: 1.11.4
Release: %{revision}%{?dist}
License: GPLv2
Group: Applications/System
......@@ -588,6 +588,10 @@ fi
%changelog
* Wed May 28 2014 Michael Friedrich <michael.friedrich@gmail.com> - 1.11.4-1
- bump 1.11.4
* Thu Apr 24 2014 Michael Friedrich <michael.friedrich@netways.de> - 1.11.2-1
* Sat May 10 2014 Michael Friedrich <michael.friedrich@netways.de> - 1.11.3-1
- bump 1.11.3
......
......@@ -114,7 +114,7 @@ extern "C" {
#define CHECKBOX_FUNCTIONS_JS "checkbox_functions.js"
#define COMMON_FUNCTIONS_JS "common_functions.js"
#define JQUERY_MAIN_JS "jquery-1.8.0.min.js"
#define JQUERY_DD_JS "jquery.dd.js"
#define JQUERY_DD_JS "jquery.dd.min.js"
#define SKINNYTIP_JS "skinnytip.js"
#define PAGE_REFRESH_JS "page_refresh.js"
#define STATUS_FILTER_JS "status_filter_functions.js"
......
......@@ -27,8 +27,8 @@
#define PROGRAM_NAME "Icinga"
#define PROGRAM_NAME_UC "ICINGA"
#define PROGRAM_NAME_LC "icinga"
#define PROGRAM_VERSION "1.11.3"
#define PROGRAM_MODIFICATION_DATE "05-10-2014"
#define PROGRAM_VERSION "1.11.4"
#define PROGRAM_MODIFICATION_DATE "05-28-2014"
/*#define DEBUG_CHECK_IPC 1 */
/*#define DEBUG_CHECK_IPC2 1*/
......
......@@ -1406,7 +1406,6 @@ ALTER TABLE icinga_servicechecks ADD COLUMN endpoint_object_id bigint default NU
ALTER TABLE icinga_statehistory ADD COLUMN endpoint_object_id bigint default NULL;
ALTER TABLE icinga_systemcommands ADD COLUMN endpoint_object_id bigint default NULL;
ALTER TABLE icinga_hosts ADD COLUMN check_service_object_id bigint default NULL;
-- -----------------------------------------
-- add index (delete)
......
-- -----------------------------------------
-- upgrade path for Icinga IDOUtils 1.12.0
--
-- -----------------------------------------
-- Copyright (c) 2014 Icinga Development Team (http://www.icinga.org)
--
-- Please check http://docs.icinga.org for upgrading information!
-- -----------------------------------------
ALTER TABLE icinga_hosts ADD COLUMN check_service_object_id bigint default NULL;
-- -----------------------------------------
-- update dbversion
-- -----------------------------------------
INSERT INTO icinga_dbversion (name, version, create_time, modify_time) VALUES ('idoutils', '1.12.0', NOW(), NOW()) ON DUPLICATE KEY UPDATE version='1.12.0', modify_time=NOW();
......@@ -1434,7 +1434,6 @@ ALTER TABLE icinga_servicechecks ADD COLUMN endpoint_object_id bigint default NU
ALTER TABLE icinga_statehistory ADD COLUMN endpoint_object_id bigint default NULL;
ALTER TABLE icinga_systemcommands ADD COLUMN endpoint_object_id bigint default NULL;
ALTER TABLE icinga_hosts ADD COLUMN check_service_object_id bigint default NULL;
-- -----------------------------------------
-- add index (delete)
......
......@@ -14,8 +14,9 @@ ALTER TABLE icinga_servicegroups ADD COLUMN notes TEXT default NULL;
ALTER TABLE icinga_servicegroups ADD COLUMN notes_url TEXT default NULL;
ALTER TABLE icinga_servicegroups ADD COLUMN action_url TEXT default NULL;
ALTER TABLE icinga_hoststatus ADD COLUMN is_reachable smallint(6) DEFAULT NULL;
ALTER TABLE icinga_servicestatus ADD COLUMN is_reachable smallint(6) DEFAULT NULL;
ALTER TABLE icinga_hoststatus ADD COLUMN is_reachable INTEGER default 0;
ALTER TABLE icinga_servicestatus ADD COLUMN is_reachable INTEGER default 0;
-- -----------------------------------------
-- update dbversion
......
-- -----------------------------------------
-- upgrade path for Icinga IDOUtils 1.12.0
--
-- -----------------------------------------
-- Copyright (c) 2014 Icinga Development Team (http://www.icinga.org)
--
-- Please check http://docs.icinga.org for upgrading information!
-- -----------------------------------------
ALTER TABLE icinga_hosts ADD COLUMN check_service_object_id bigint default NULL;
-- -----------------------------------------
-- update dbversion
-- -----------------------------------------
SELECT updatedbversion('1.12.0');
......@@ -22,8 +22,8 @@
#define LOG2IDO_NAME "LOG2IDO"
/* only one space for update-version matching */
#define IDO_DATE "05-10-2014"
#define IDO_VERSION "1.11.3"
#define IDO_DATE "05-28-2014"
#define IDO_VERSION "1.11.4"
#define IDO_SCHEMA_VERSION "1.11.3"
......
......@@ -10,10 +10,10 @@ else
fi
# Current version number
CURRENTVERSION=1.11.3
CURRENTVERSION=1.11.4
# Last date
LASTDATE=05-10-2014
LASTDATE=05-28-2014
if [ "x$1" = "x" ]
then
......
......@@ -743,11 +743,17 @@ int xodtemplate_process_config_file(char *filename, int options) {
break;
}
if (!strcmp(input, "hostextinfo") || !strcmp(input, "serviceextinfo")) {
logit(NSLOG_CONFIG_WARNING, TRUE, "Warning: Object definition type '%s' is DEPRECATED in file '%s' on line %d.\n", input, filename, current_line);
}
/* check validity of object type */
if (strcmp(input, "timeperiod") && strcmp(input, "command") && strcmp(input, "contact") && strcmp(input, "contactgroup") && strcmp(input, "host") && strcmp(input, "hostgroup") && strcmp(input, "servicegroup") && strcmp(input, "service") && strcmp(input, "servicedependency") && strcmp(input, "serviceescalation") && strcmp(input, "hostgroupescalation") && strcmp(input, "hostdependency") && strcmp(input, "hostescalation") && strcmp(input, "hostextinfo") && strcmp(input, "serviceextinfo") && strcmp(input, "module")) {
logit(NSLOG_CONFIG_ERROR, TRUE, "Error: Invalid object definition type '%s' in file '%s' on line %d.\n", input, filename, current_line);
#ifdef NSCORE
result = ERROR;
break;
#endif
}
/* we're already in an object definition... */
......@@ -948,8 +954,13 @@ int xodtemplate_begin_object_definition(char *input, int options, int config_fil
xodtemplate_current_object_type = XODTEMPLATE_SERVICEEXTINFO;
else if (!strcmp(input, "module"))
xodtemplate_current_object_type = XODTEMPLATE_MODULE;
else
else {
#ifdef NSCORE
return ERROR;
#else
return OK;
#endif
}
/* check to see if we should process this type of object */
......@@ -1260,7 +1271,11 @@ int xodtemplate_add_object_property(char *input, int options) {
return OK;
break;
default:
#ifdef NSCORE
return ERROR;
#else
return OK;
#endif
break;
}
......@@ -1343,7 +1358,11 @@ int xodtemplate_add_object_property(char *input, int options) {
temp_timeperiod->register_object = (atoi(value) > 0) ? TRUE : FALSE;
else if (xodtemplate_parse_timeperiod_directive(temp_timeperiod, variable, value) == OK)
result = OK;
else {
else if (variable[0] == '_') {
#ifdef NSCORE
logit(NSLOG_CONFIG_ERROR, TRUE, "Warning: ignoring unused custom variable in timeperiod object directive '%s'.\n", variable);
#endif
} else {
logit(NSLOG_CONFIG_ERROR, TRUE, "Error: Invalid timeperiod object directive '%s'.\n", variable);
return ERROR;
}
......@@ -1498,7 +1517,11 @@ int xodtemplate_add_object_property(char *input, int options) {
temp_contactgroup->have_contactgroup_members = TRUE;
} else if (!strcmp(variable, "register"))
temp_contactgroup->register_object = (atoi(value) > 0) ? TRUE : FALSE;
else {
else if (variable[0] == '_') {
#ifdef NSCORE
logit(NSLOG_CONFIG_ERROR, TRUE, "Warning: ignoring unused custom variable in contactgroup object directive '%s'.\n", variable);
#endif
} else {
logit(NSLOG_CONFIG_ERROR, TRUE, "Error: Invalid contactgroup object directive '%s'.\n", variable);
return ERROR;
}
......@@ -1606,7 +1629,11 @@ int xodtemplate_add_object_property(char *input, int options) {
temp_hostgroup->have_action_url = TRUE;
} else if (!strcmp(variable, "register"))
temp_hostgroup->register_object = (atoi(value) > 0) ? TRUE : FALSE;
else {
else if (variable[0] == '_') {
#ifdef NSCORE
logit(NSLOG_CONFIG_ERROR, TRUE, "Warning: ignoring unused custom variable in hostgroup object directive '%s'.\n", variable);
#endif
} else {
logit(NSLOG_CONFIG_ERROR, TRUE, "Error: Invalid hostgroup object directive '%s'.\n", variable);
return ERROR;
}
......@@ -1715,7 +1742,11 @@ int xodtemplate_add_object_property(char *input, int options) {
temp_servicegroup->have_action_url = TRUE;
} else if (!strcmp(variable, "register"))
temp_servicegroup->register_object = (atoi(value) > 0) ? TRUE : FALSE;
else {
else if (variable[0] == '_') {
#ifdef NSCORE
logit(NSLOG_CONFIG_ERROR, TRUE, "Warning: ignoring unused custom variable in servicegroup object directive '%s'.\n", variable);
#endif
} else {
logit(NSLOG_CONFIG_ERROR, TRUE, "Error: Invalid servicegroup object directive '%s'.\n", variable);
return ERROR;
}
......@@ -1896,7 +1927,11 @@ int xodtemplate_add_object_property(char *input, int options) {
temp_servicedependency->have_notification_dependency_options = TRUE;
} else if (!strcmp(variable, "register"))
temp_servicedependency->register_object = (atoi(value) > 0) ? TRUE : FALSE;
else {
else if (variable[0] == '_') {
#ifdef NSCORE
logit(NSLOG_CONFIG_ERROR, TRUE, "Warning: ignoring unused custom variable in service dependency object directive '%s'.\n", variable);
#endif
} else {
logit(NSLOG_CONFIG_ERROR, TRUE, "Error: Invalid servicedependency object directive '%s'.\n", variable);
return ERROR;
}
......@@ -2072,7 +2107,11 @@ int xodtemplate_add_object_property(char *input, int options) {
}
} else if (!strcmp(variable, "register"))
temp_serviceescalation->register_object = (atoi(value) > 0) ? TRUE : FALSE;
else {
else if (variable[0] == '_') {
#ifdef NSCORE
logit(NSLOG_CONFIG_ERROR, TRUE, "Warning: ignoring unused custom variable in service escalation object directive '%s'.\n", variable);
#endif
} else {
logit(NSLOG_CONFIG_ERROR, TRUE, "Error: Invalid serviceescalation object directive '%s'.\n", variable);
return ERROR;
}
......@@ -2471,16 +2510,28 @@ int xodtemplate_add_object_property(char *input, int options) {
result = ERROR;
}
temp_host->have_initial_state = TRUE;
} else if (!strcmp(variable, "check_interval") || !strcmp(variable, "normal_check_interval")) {
} else if (!strcmp(variable, "check_interval")) {
temp_host->check_interval = strtod(value, NULL);
temp_host->have_check_interval = TRUE;
} else if (!strcmp(variable, "retry_interval") || !strcmp(variable, "retry_check_interval")) {
} else if (!strcmp(variable, "normal_check_interval")) {
logit(NSLOG_CONFIG_WARNING, TRUE, "Warning: Variable '%s' with value '%s' is DEPRECATED. Replace it with 'check_interval'.\n", variable, value);
temp_host->check_interval = strtod(value, NULL);
temp_host->have_check_interval = TRUE;
} else if (!strcmp(variable, "retry_interval")) {
temp_host->retry_interval = strtod(value, NULL);
temp_host->have_retry_interval = TRUE;
} else if (!strcmp(variable, "retry_check_interval")) {
logit(NSLOG_CONFIG_WARNING, TRUE, "Warning: Variable '%s' with value '%s' is DEPRECATED. Replace it with 'retry_interval'.\n", variable, value);
temp_host->retry_interval = strtod(value, NULL);
temp_host->have_retry_interval = TRUE;
} else if (!strcmp(variable, "max_check_attempts")) {
temp_host->max_check_attempts = atoi(value);
temp_host->have_max_check_attempts = TRUE;
} else if (!strcmp(variable, "checks_enabled") || !strcmp(variable, "active_checks_enabled")) {
} else if (!strcmp(variable, "active_checks_enabled")) {
temp_host->active_checks_enabled = (atoi(value) > 0) ? TRUE : FALSE;
temp_host->have_active_checks_enabled = TRUE;
} else if (!strcmp(variable, "checks_enabled")) {
logit(NSLOG_CONFIG_WARNING, TRUE, "Warning: Variable '%s' with value '%s' is DEPRECATED. Replace it with 'active_checks_enabled'.\n", variable, value);
temp_host->active_checks_enabled = (atoi(value) > 0) ? TRUE : FALSE;
temp_host->have_active_checks_enabled = TRUE;
} else if (!strcmp(variable, "passive_checks_enabled")) {
......@@ -2626,6 +2677,7 @@ int xodtemplate_add_object_property(char *input, int options) {
logit(NSLOG_CONFIG_ERROR, TRUE, "Error: Invalid 3d_coords value '%s' in host definition.\n", temp_ptr);
return ERROR;
}
logit(NSLOG_CONFIG_WARNING, TRUE, "Warning: Variable '%s' for host '%s' is DEPRECATED. Remove it from your configuration.\n", variable, value);
temp_host->z_3d = strtod(temp_ptr, NULL);
temp_host->have_3d_coords = TRUE;
} else if (!strcmp(variable, "obsess_over_host")) {
......@@ -2861,10 +2913,18 @@ int xodtemplate_add_object_property(char *input, int options) {
} else if (!strcmp(variable, "max_check_attempts")) {
temp_service->max_check_attempts = atoi(value);
temp_service->have_max_check_attempts = TRUE;
} else if (!strcmp(variable, "check_interval") || !strcmp(variable, "normal_check_interval")) {
} else if (!strcmp(variable, "check_interval")) {
temp_service->check_interval = strtod(value, NULL);
temp_service->have_check_interval = TRUE;
} else if (!strcmp(variable, "normal_check_interval")) {
logit(NSLOG_CONFIG_WARNING, TRUE, "Warning: Variable '%s' with value '%s' is DEPRECATED. Replace it with 'check_interval'.\n", variable, value);
temp_service->check_interval = strtod(value, NULL);
temp_service->have_check_interval = TRUE;
} else if (!strcmp(variable, "retry_interval") || !strcmp(variable, "retry_check_interval")) {
} else if (!strcmp(variable, "retry_interval")) {
temp_service->retry_interval = strtod(value, NULL);
temp_service->have_retry_interval = TRUE;
} else if (!strcmp(variable, "retry_check_interval")) {
logit(NSLOG_CONFIG_WARNING, TRUE, "Warning: Variable '%s' with value '%s' is DEPRECATED. Replace it with 'retry_interval'.\n", variable, value);
temp_service->retry_interval = strtod(value, NULL);
temp_service->have_retry_interval = TRUE;
} else if (!strcmp(variable, "active_checks_enabled")) {
......@@ -3180,7 +3240,11 @@ int xodtemplate_add_object_property(char *input, int options) {
temp_hostdependency->have_execution_dependency_options = TRUE;
} else if (!strcmp(variable, "register"))
temp_hostdependency->register_object = (atoi(value) > 0) ? TRUE : FALSE;
else {
else if (variable[0] == '_') {
#ifdef NSCORE
logit(NSLOG_CONFIG_ERROR, TRUE, "Warning: ignoring unused custom variable in host dependency object directive '%s'.\n", variable);
#endif
} else {
logit(NSLOG_CONFIG_ERROR, TRUE, "Error: Invalid hostdependency object directive '%s'.\n", variable);
return ERROR;
}
......@@ -3318,7 +3382,11 @@ int xodtemplate_add_object_property(char *input, int options) {
}
} else if (!strcmp(variable, "register"))
temp_hostescalation->register_object = (atoi(value) > 0) ? TRUE : FALSE;
else {
else if (variable[0] == '_') {
#ifdef NSCORE
logit(NSLOG_CONFIG_ERROR, TRUE, "Warning: ignoring unused custom variable in host escalation object directive '%s'.\n", variable);
#endif
} else {
logit(NSLOG_CONFIG_ERROR, TRUE, "Error: Invalid hostescalation object directive '%s'.\n", variable);
return ERROR;
}
......@@ -3596,7 +3664,11 @@ int xodtemplate_add_object_property(char *input, int options) {
result = ERROR;
} else if (!strcmp(variable, "register"))
temp_module->register_object = (atoi(value) > 0) ? TRUE : FALSE;
else {
else if (variable[0] == '_') {
#ifdef NSCORE
logit(NSLOG_CONFIG_ERROR, TRUE, "Warning: ignoring unused custom variable in module object directive '%s'.\n", variable);
#endif
} else {
logit(NSLOG_CONFIG_ERROR, TRUE, "Error: Invalid module object directive '%s'.\n", variable);
return ERROR;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment