From 53cbc86e9cc628b1abdc07eeccc005bda9301852 Mon Sep 17 00:00:00 2001 From: Menna Elmasry <65324011+MonzElmasry@users.noreply.github.com> Date: Wed, 19 Aug 2020 19:07:58 +0200 Subject: [PATCH] Enable prometheus metrics (#9) * Enable prometheus metrics --- assets/rke2-canal/rke2-canal-v3.13.3.tgz | Bin 5538 -> 0 bytes .../rke2-canal/charts/templates/daemonset.yaml | 3 +++ packages/rke2-canal/charts/values.yaml | 2 ++ 3 files changed, 5 insertions(+) delete mode 100644 assets/rke2-canal/rke2-canal-v3.13.3.tgz diff --git a/assets/rke2-canal/rke2-canal-v3.13.3.tgz b/assets/rke2-canal/rke2-canal-v3.13.3.tgz deleted file mode 100644 index e6583c4c351aad52da70855bb9a12fb47923e358..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5538 zcmV;T6Dc zVQyr3R8em|NM&qo0PHqX0_=9XXSj=tqcQF##>Sk%J-4y3!HB8^ zv=&mWq{3!r=6?HyQuSR0w!3Y2?}qDP+LWYJDwWDFW!9)0IP!cdC~x;yRGHS6uK5p7 z`*b>;&dKpH{@dwv%KvtbkKX@q`1bwb$;sinlg_&zI)`r$kKX-2I!}y8?GtH3)eoJo zo~yjLf02iV>@z6Mr09~(VS|QY_VaD)@NMgDBLM9y78-mx6xvYEN#C*z8G*T#>V}MY zv}B^ySjjbX$;y~eciZjT+uK&Cuh@K>N(zFap55!B9b<=&BVI@b;NDr4k^mXY!SK_#dxnOQ}13!@#w zYr6qBM`Kf7^S9oX7khH&e?xf$`WXbkJ?H=J@$pId{J%YU|9bvk;_*DM(KsN}6_DY0 zb4+{|C=yD^iIK!tKn)Nnh$WJVLc$hANC5=ym^Qja#xfwou_m{Sb25j<0r6K-gCGkf z*Tk%tCW?wBv>Krd`Ycdg(md?6j*nWMR;PV<(rh#qoC*QF+aTnC+(dKm;x~k?=@J^m z{o5tU!Ht`%{S93vy{B~9C7Vv`@UYdvj&^}e7*Gr91Bo;QWWIIchb*KbE2$0nPw&6n zAHH0#Bf)%XgSpM!jL(q;^qx8D-iZSIiO4@i;pxDOKcS~fFCsi2w*`YZiteR z0SlAaQC-q(R##%@ry?L!Eu%FEqe+997_#RkuYqHxXxYwE@^J=I29Ir@-&=mcl*~L z4GD890%_-V!$R-{8y5G`jdR0rA1tx50ruDK5oa9kHj>hzFmPg#~Tbfu! zrhroeLCgv`yKWWPDAoxU$SE~c8>xVpZ3qYi2e!!2*uN|lff=itEWs5B1DZ%h!1#d$ z8zcax+Yq|0lK=ybM}DQuAkZM2M-nEOVU)9f;zDmJGiOqzm~@Fz5jZkRv0%$cfnzd4 zmrDgpw-Iw{S1knzWkCAF(<=)r(lC~R{gs1q$~2vGARj)C5e^ee+z+SgnOJ^En8Aty zH!+X20p*BdF%Cc&w%Fns2q5HgYuOmvkr`ZnM}y|gPx=i~v00dZ!8i~umrHw?v?RY- zV)=&KcltMCk-?n`T>mr1;oSAESlv`3OpKyoPkDGVxh5fX)7%aWZ>P~D_AJdtD%(_8_K)n z#7U+J7;=W-lC>I1noKNYGez-SE+?=7#msi%D*(|YwgZkI2uCdhu>#7?%3pzhlMeob z?_9SaN19((fQ%{?o_`~Wl_(J?8UQhhE*8wUZv)VV3FIP;J#U#=F@Z4b{#u5LnZwSR z0m;pkEfPc!N+xhVl(mUmq(1Vgk)+q}5606J|5Mjt5D%QnPg0wn@9a_6x5WJxtBdKi zg%xRJxDA+9bTPf|lEdS7u}0X2D{6&y%s+TMjeR)*wP8Mt(5^%t|JGXi`JSBpXJ8## zS*Y8i%jsa!GI!=_=D5%QJ32fr*?-3;M~AQW-%C8P=8gTh5dAo^qMFPBM54;=*=Sg% z=vp*}G}t3e32X!+pW`j+d9k|od(yzK`cx&AP?8V#m{$!v6a zI+%@m7lYZXIAU$0W|z!n{n2oCF}t?sGkiuf@!ScBDDK9|9J}xL?d&S-^ z3sgRS@n>PCP;%yP_swsOf} z{_AfI_bZO@xL8>2VQrBM840Uem@pE>Ll!%W?-Jsm1?q^_-?h~%e-w{ee0|X@2$48Y znG+uA;fezvg{^H)9T{qbY#cNzs*7yBe|`@JZ@vAef~UL&xX1o`|Ni)};{P3YUhTh^ zcVO7Zhq1&Cfl3CIT(7F7dAEz5+J+rx%c!*-PRWeD9Q@Yo<^sbmy(N&P5mFJz`=Y%O;26go^ld>r@l z(_>S}BSm=)ZrEz=u!vJtZErLzRiBksA%J>$5{&`j6exq3R0(2VKRX?`^lz+DDp1M1 zFgfhxJvaHbNR%R4W!mIgx6e(XIL>ZOIko;4=PHIX%n&G$ss_IjxvD*$n`Rhu{+6-` z~Rj8=SsY_%ws2v_a%>?gD^r3UjY zsWt(#n`9QZedN+$o|{$}Op0%TUYJgwq)soO3N$LxOai7 zut1dzn-WRVhL@m+6M^4=ApImNS)@pePYp@pFy;%;WJN{5Us^U>ntZ~ED>RAmsiBE$ zd48INQt}t4$5={Uq6Oknp@V(<+%)(iy*)|-?!i}+W4F@YudZKIQ9oKmKRtoU`gylz z>ZP{QuhcPe5TUg@z}}2Hzk5IXXHzF5my3bdHZ+<3BI)Jna4t??Ljne`_k(0<=kP zOf-gI-IZ4wfPF)#Cbz)tDC&CjN5eSDAWjD;1b2xPjRSY{vZk0&X8YI%bKWUGK_H4V{^F#;$2j58LI<2Yk zSLeA=m2rebVL%N`jG_jXTi4BCg4~tloQdT%cEI;4|0aRBrgztZZYbk)&Y?@JC`ooQ zMk7Z6`|turH8|Oa3L%a2GqawK4c-vSrC8$ipW9x=@ZPHz1XAcr!MDUn4)F!s9JsuF zlY_CQ>PDwGhEx+u{1^hELEuU8hJetKVq!^{A@QFo6vqh!wy839?=&gD&~; zM<<124zQ2q*-3#Dkjw=jQg;bwBD#y)t=A9>{4{|Mc_AfaVIMB&4G60|Yl zlX90@tFvW!1QrYMO_z-1B<`ELyOE)tNvbXxV4injI(4&m$MD8mLAE9NS#Mz5tznXf zOr1x0a0h;59)NLtv)}W5842SO`trPeKrWbIYxYkdfxN|RXA(Geqsbv7QMkn0X{ks6 z9PAGK2Qk2TUJw~c0!b)oE~N4y1)mIPW>qo8-4CRX`8Ga;Mz`&zb4df;4yF4~`@n!& z$CvG%Tv%31H!|1sQBfaU%Id^rt9D5z?v|XBKBrncA~;coa@|WdFz#(lpuWuNaf(Mi zlkP>)Zw33D391q^%?+`~v3ld~QhN)R?74l84RZ(G^99T8b6g5gz4K4f%gLXAcB`#P zGIw?bXP-FBzDxevZ0DwH=~eS@xo#jf-NH@o0ory%F4C3fmzCB{v;c&a`Qk=C4m=*qOnw6Oqwi`s?M@FEe)uU5Cw?lIw1%fyDD& z(C`=7UcsW;;Xye&2;jmLN-(}tFd?P(#7=pyV#l}=ccrrv4RcOsGtd$ ziU+I!(i|YPLUbW*FIB%Ilk>q~yyGljLVlkAHf`grLPnQ?o1KoP_Yf;u*@aqCuHpf zfmN?(9PY?xTr)XU%$h1_-#8g#dxW5@Rv_1c-H}tdrc98D^ltz&xG3lHmYlL1Yf$G! zGp6e$sc7JAIG3U?-6TMqM@}YN;gjBYSQXN7(Tx`%Vh@qi`7)iy$m(6YUXKap9To^( z+0F{eU$Rert)9G!gf9C+sX)%z3~6>5%kN7zBvf*#=vrs#*=|3qQpHR^oj}bEw~MQ8 zRL+m9QGf+{HnG-krXs-#dS~aBriEIM+0PoKdaWT(o!)quc#U)F-&i4%CZN@ek<;F^ zH}1!cqn#Rh1PD=(yB46w%Sjl zUwgyp?CkPtmJ;isn3U_zcH?6;^kbE>)xX(GU?1Eo?lO{NzC#Z(2B6~JCAO7!bIG*-C zoDU{fgR`r_&+3N7$ea!*ma8za zc6NUG@#An*>)>=r(<<~b9$#3nSVhP2`03!RcYQt`j84aw!_jnl`RQ^p?e(X_%h99w zd`~UpZlSWj26h+9!|~^n$@O@Ac{P3HQB2Ee_p68aL^@0=2CrTHA?dEyRUO^0lv zq=bIgOdG0jw)EQ!)p<5lc`6cKZI{Q*WJ!0=OqP0IFp~q|d@{Wiera&slI{7ROAsdK zu$7{!$~uopEkjo9RrCic};S1|t}kiG6*S}RuL+ZEb&23CuH zB?e=xu!si-c~SrS@1C=3DpOFk)J5^??HJyyXZ~+=es~Ut9^V>sO!P< z`W|V$Tdrl{G(3EszgX@Jqk-|;d12CS=#IEx-u~m^&ufD7%#i@$Nb+<p7MXUhQ}Vj^YO&F z%c=gTCYD?uir-6$y6C>QHyFPcTz!N;LqB%pcgNeStXOLu)Fa`x?vyFa7T8wyk5pN; z&YURIx_W<5v+et0=Uk8mKQ(wH|SBTf2Or|#&+UumjNUR!ps8zWcOm#ZSpsJ5&4)V39h!815%b$p@c z4jB0|827tSNR~mZW3@`FhMZK~HKMNXuDWE~R;~EMCDjyt*Giqetd(qWq>}_6)Ijb$ zJCT69o!upV{ce{@zHf_n(WSIfKko|^#L=T<%(jlpih#5@m6+o)H-ptf=}I7u;xG%tmOuR_)0dHL@WitOX|WkZJo?`$Q|Xa*3sOa82sNqxZcHO6*1Xe=2I>w+`G=5 zl-fmrI3W0h>(9G7Pep@o?VY|p&;8WKe@ZU-*G7Ww`~LIc+w%9n-gjRA{~s^&l%-rM k%Sr-cha7tq9k0*p^ZL9#|Dw diff --git a/packages/rke2-canal/charts/templates/daemonset.yaml b/packages/rke2-canal/charts/templates/daemonset.yaml index ac12a91..c066119 100644 --- a/packages/rke2-canal/charts/templates/daemonset.yaml +++ b/packages/rke2-canal/charts/templates/daemonset.yaml @@ -146,6 +146,9 @@ spec: value: {{ .Values.calico.felixLogSeverityScreen | quote }} - name: FELIX_HEALTHENABLED value: {{ .Values.calico.felixHealthEnabled | quote }} + # enable promentheus metrics + - name: FELIX_PROMETHEUSMETRICSENABLED + value: { { .Values.calico.felixPrometheusMetricsEnabled | quote } } securityContext: privileged: true resources: diff --git a/packages/rke2-canal/charts/values.yaml b/packages/rke2-canal/charts/values.yaml index 5a2c388..f81f9ca 100644 --- a/packages/rke2-canal/charts/values.yaml +++ b/packages/rke2-canal/charts/values.yaml @@ -50,6 +50,8 @@ calico: felixLogSeverityScreen: info # Enable felix healthcheck. felixHealthEnabled: true + # Enable prometheus metrics + felixPrometheusMetricsEnabled: true # Whether or not to masquerade traffic to destinations not within # the pod network. masquerade: true