From 9967a1f2697d40065cd749c0f07f5d030d05ad9d Mon Sep 17 00:00:00 2001 From: Juan Manuel Grados Luyando Date: Thu, 2 Mar 2023 12:10:16 +0100 Subject: [PATCH] Adding Index graphs and data to graphana --- .../co2/dashboard_input_CO2-emissions.csv | 26 +++++++++--------- .../dashboard/grafana/co2/job_cncCutter.csv | 3 ++ software/dashboard/grafana/co2/state_cnc.csv | 13 +++++++++ software/dashboard/grafana/grafana.db | Bin 946176 -> 1028096 bytes 4 files changed, 29 insertions(+), 13 deletions(-) create mode 100755 software/dashboard/grafana/co2/job_cncCutter.csv create mode 100755 software/dashboard/grafana/co2/state_cnc.csv diff --git a/software/dashboard/grafana/co2/dashboard_input_CO2-emissions.csv b/software/dashboard/grafana/co2/dashboard_input_CO2-emissions.csv index 61f12cb..7d62f55 100755 --- a/software/dashboard/grafana/co2/dashboard_input_CO2-emissions.csv +++ b/software/dashboard/grafana/co2/dashboard_input_CO2-emissions.csv @@ -1,14 +1,14 @@ Jahr,Verarbeitendes Gewerbe (in kt),Verkehr gesamt (in kt),Straßenverkehr (in kt),Haushalte und GHD gesamt (in kt),Haushalte (in kt),"Gewerbe, Handel, Dienstleistungen GHD (in kt)",CO2-Emissionen gesamt (in kt) -2020,3702,3760,2989,6070,3165,2905,13532 -2019,3956,4708,3313,6477,3451,3026,15140 -2018,4220,4755,3294,6982,3600,3382,15957 -2017,4630,4653,3333,7012,3509,3503,16294 -2016,4661,4577,3287,7314,3637,3677,16552 -2015,5135,4460,3198,7434,3593,3841,17029 -2014,5388,4417,3178,7419,3657,3762,17224 -2013,5224,4337,3165,8277,4056,4221,17839 -2012,5848,4259,3033,8313,4030,4283,18419 -2011,5714,4279,3045,8143,4052,4091,18136 -2010,5899,4243,3065,8611,4245,4366,18753 -2009,5442,4172,3013,8360,4159,4201,17974 -2008,5835,4234,3019,8462,4284,4178,18531 +2020-01-01,3702,3760,2989,6070,3165,2905,13532 +2019-01-01,3956,4708,3313,6477,3451,3026,15140 +2018-01-01,4220,4755,3294,6982,3600,3382,15957 +2017-01-01,4630,4653,3333,7012,3509,3503,16294 +2016-01-01,4661,4577,3287,7314,3637,3677,16552 +2015-01-01,5135,4460,3198,7434,3593,3841,17029 +2014-01-01,5388,4417,3178,7419,3657,3762,17224 +2013-01-01,5224,4337,3165,8277,4056,4221,17839 +2012-01-01,5848,4259,3033,8313,4030,4283,18419 +2011-01-01,5714,4279,3045,8143,4052,4091,18136 +2010-01-01,5899,4243,3065,8611,4245,4366,18753 +2009-01-01,5442,4172,3013,8360,4159,4201,17974 +2008-01-01,5835,4234,3019,8462,4284,4178,18531 diff --git a/software/dashboard/grafana/co2/job_cncCutter.csv b/software/dashboard/grafana/co2/job_cncCutter.csv new file mode 100755 index 0000000..3e92978 --- /dev/null +++ b/software/dashboard/grafana/co2/job_cncCutter.csv @@ -0,0 +1,3 @@ +ID,Path,StartTime,EndTime +0,C:\Users\InMachines\Desktop\MQTT\bCNC-laser\tests\static\sample.gcode,2023-03-01 12:31:30.351399,2023-03-01 12:31:52.538042 +1,C:\Users\InMachines\Desktop\MQTT\bCNC-laser\tests\static\sample.gcode,2023-03-01 12:32:17.547355,2023-03-01 12:32:38.265005 diff --git a/software/dashboard/grafana/co2/state_cnc.csv b/software/dashboard/grafana/co2/state_cnc.csv new file mode 100755 index 0000000..0ab422f --- /dev/null +++ b/software/dashboard/grafana/co2/state_cnc.csv @@ -0,0 +1,13 @@ +Time,State-CNC,State-Lasercutter,State-3D-Printer +2023-03-01 12:31:28,Connected,Connected,Connected +2023-03-01 12:31:29,Idle,Idle,Idle +2023-03-01 12:31:30,Idle, Run,Idle +2023-03-01 12:31:31,Run,Idle,Run +2023-03-01 12:31:32,Idle,Run,Run +2023-03-01 12:31:33,Run,Run,Run +2023-03-01 12:31:52,Idle,Idle,Run +2023-03-01 12:31:52,Idle,Run,Idle +2023-03-01 12:32:17,Idle,Run,Idle +2023-03-01 12:32:20,Run,Idle,Run +2023-03-01 12:32:39,Idle,Run,Run +2023-03-01 12:32:39,Idle,Idle,Idle diff --git a/software/dashboard/grafana/grafana.db b/software/dashboard/grafana/grafana.db index 87fdac61afe064bcd0e62fd036bc6d3292ba3f54..47bf115137a2937c2167aad3e79609a66c850a7e 100755 GIT binary patch delta 18596 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 delta 984 zcmYk5U1(cX9Kg@H=YE`fbMN`5rcGzHy|ER_T9V8p>g-_MSp9gB&KE%pG+i1uX_wR_ zEnSCf_!1acJHmGMAb!9e`d~F%p%bH1m5N$Z&vl@EIOoFu z_dEZObMHM}-G93J+;oddwh=-nHFotiuhs3bXJr+=ofl53fLP zu`SRt*RZFV75hVeOp9-X_H_**UC(AlQl3Wg7|x}V*;GD9d<~=2!ip#h=g z-pr)uCc`K8Sdn04Zy@qiPc+&Sd*+?Qd;%+@iggZI=R{*iNt1aN;m*!dT8~C`om!Mq zn-WLAjxS(-_zJS?r*}doaDwe0I1ZxOtuqJxG0etP0)Gk7s2>yc2xrWj& z;B3ApF)x*@Ze*=l-9oc1r+ZdPNd|5mA%1b^hkX3PXHrNV&1NP}oaCihsg?I;45Rtv z+b_L*==s-PJo4(KAu39+f?x&KMUL+Q@8&CCO1nj|4FntTrzmz0OhwiyCSupIba~X{ zEqJPuSVSz@@l=&RY(}6aa-ns%L#T;d6Pk188|x_LHBfzx6mB8dg5Tjc@v+>4J8&Cr z3F#}~Kiaf|Z`mppPQ@K?Ll{57D%^x?P!Y~$C{)6#QweK52j=93t?>Lu+NWVpvY!6> zNur=$N#>udYLBXzCF{8{esfW4SIlI6@2a!CsLcQl@|jgFZV( zwSB}O5JHfL5L^+_0Pv;1HI>Jc|rr)C?z z0|sGX1SwWwVR7yW=7iJ64_KU8MsOFF;em*jfiIsjf>dI0g~ef9gbuSpe9Ca*Q=XYi z?vVC*uca2$gz2aWtG;N;N(7mzeqKu`5uvv$PULBJy^Fu)Wl0Vnvip3Yfps_^9Arzn fGyXa|BlE%UjK_Tse}!02Ec!yEFW7f{A~yUF6wWCf