Skip to content

Commit bb258a5

Browse files
author
Stephan Lammel
committed
add links to new FTS dashboard site vieas for links* and fts* metrics
1 parent ea9d011 commit bb258a5

File tree

2 files changed

+94
-64
lines changed

2 files changed

+94
-64
lines changed

‎cmssst/www/cgi-bin/log_fetcher.py‎

Lines changed: 47 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2353,7 +2353,7 @@ def lftch_maindvi_fts(cfg, docs):
23532353
# ################################################################ #
23542354
# prepare mainDVI section with CMS FTS evaluation according to cfg #
23552355
# ################################################################ #
2356-
LFTCH_FTSDASHB = "https://monit-grafana.cern.ch/d/000000420/fts-transfers-30-days?orgId=20&from=%d000&to=%d000&var-group_by=endpnt&var-vo=cms&var-src_country=All&var-dst_country=All&var-src_site=All&var-dst_site=All&var-fts_server=All&var-bin=$__auto_interval_bin&var-filters=%s|=|%s"
2356+
LFTCH_FTSDASHB = "https://monit-grafana.cern.ch/d/000000420/fts-transfers-30-days?orgId=20&from=%d000&to=%d000&var-group_by=endpnt&var-vo=cms&var-src_country=All&var-dst_country=All&var-src_site=All&var-dst_site=All&var-fts_server=All&var-bin=$__auto_interval_bin"
23572357
#
23582358
siteRegex = re.compile(r"T\d_[A-Z]{2,2}_\w+")
23592359

@@ -2510,20 +2510,29 @@ def lftch_maindvi_fts(cfg, docs):
25102510
"ent id\n <TD BGCOLOR=\"%s\" N" +
25112511
"OWRAP>%s\n") %
25122512
(myColour, myDoc['***DOCID***']))
2513-
if (( myDoc['status'] != "unknown" ) and
2514-
(( myDoc['type'] == "destination" ) or
2515-
( myDoc['type'] == "source" ))):
2516-
sTIS = tbin * cfg['period']
2517-
eTIS = sTIS + cfg['period']
2518-
if ( myDoc['type'] == "destination" ):
2519-
sKEY = "dst_hostname"
2520-
else:
2521-
sKEY = "src_hostname"
2513+
sTIS = tbin * cfg['period']
2514+
eTIS = sTIS + cfg['period']
2515+
if ( myDoc['type'] == "site" ):
25222516
myFile.write((" <TR>\n <TD COLSPAN=" +
2523-
"\"2\"><A HREF=\"%s\"><I>Link to t" +
2524-
"ransfers in Grafana FTS dashboard" +
2525-
"</I></A>\n") % (LFTCH_FTSDASHB %
2526-
(sTIS, eTIS, sKEY, myDoc['name'])))
2517+
"\"2\"><A HREF=\"%s&var-include=%s" +
2518+
"\"><I>Link to transfers in Grafan" +
2519+
"a FTS dashboard</I></A>\n") %
2520+
((LFTCH_FTSDASHB % (sTIS, eTIS)),
2521+
myDoc['name']))
2522+
elif ( myDoc['type'] == "destination" ):
2523+
myFile.write((" <TR>\n <TD COLSPAN=" +
2524+
"\"2\"><A HREF=\"%s&var-filters=ds" +
2525+
"t_hostname|=|%s\"><I>Link to tran" +
2526+
"sfers in Grafana FTS dashboard</I" +
2527+
"></A>\n") % ((LFTCH_FTSDASHB %
2528+
(sTIS, eTIS)), myDoc['name']))
2529+
elif ( myDoc['type'] == "source" ):
2530+
myFile.write((" <TR>\n <TD COLSPAN=" +
2531+
"\"2\"><A HREF=\"%s&var-filters=sr" +
2532+
"c_hostname|=|%s\"><I>Link to tran" +
2533+
"sfers in Grafana FTS dashboard</I" +
2534+
"></A>\n") % ((LFTCH_FTSDASHB %
2535+
(sTIS, eTIS)), myDoc['name']))
25272536
myFile.write(" </TABLE>\n <BR>\n")
25282537
else:
25292538
myFile.write(" <TD>&nbsp;\n")
@@ -2891,7 +2900,7 @@ def lftch_maindvi_links(cfg, docs):
28912900
# ################################################################## #
28922901
# prepare mainDVI section with CMS Link evaluations according to cfg #
28932902
# ################################################################## #
2894-
LFTCH_FTSDASHB = "https://monit-grafana.cern.ch/d/000000420/fts-transfers-30-days?orgId=20&from=%d000&to=%d000&var-group_by=endpnt&var-vo=cms&var-src_country=All&var-dst_country=All&var-src_site=All&var-dst_site=All&var-fts_server=All&var-bin=$__auto_interval_bin&var-filters=%s|=|%s"
2903+
LFTCH_FTSDASHB = "https://monit-grafana.cern.ch/d/000000420/fts-transfers-30-days?orgId=20&from=%d000&to=%d000&var-group_by=endpnt&var-vo=cms&var-src_country=All&var-dst_country=All&var-src_site=All&var-dst_site=All&var-fts_server=All&var-bin=$__auto_interval_bin"
28952904
#
28962905
siteRegex = re.compile(r"T\d_[A-Z]{2,2}_\w+")
28972906

@@ -3231,8 +3240,7 @@ def lftch_maindvi_links(cfg, docs):
32313240
">\n <TH CLASS=\"Description\">Version numbe" +
32323241
"r<br>(= insert time)\n <TD CLASS=\"%s\">%d." +
32333242
"%3.3d (%s UTC)\n<TR>\n <TH CLASS=\"Descript" +
3234-
"ion\">Document id\n <TD CLASS=\"%s\">%s\n</" +
3235-
"TABLE>\n\n") %
3243+
"ion\">Document id\n <TD CLASS=\"%s\">%s\n") %
32363244
(site, site, clss, siteDocs[site]['name'],
32373245
clss, siteDocs[site]['type'],
32383246
clss, q_strng,
@@ -3243,6 +3251,14 @@ def lftch_maindvi_links(cfg, docs):
32433251
time.strftime("%Y-%m-%d %H:%M:%S",
32443252
time.gmtime(int(siteDocs[site]['***VERSION***']/1000))),
32453253
clss, siteDocs[site]['***DOCID***']))
3254+
sTIS = tbin * cfg['period']
3255+
eTIS = sTIS + cfg['period']
3256+
myFile.write((" <TR>\n <TD COLSPAN=\"2\"><A HRE" +
3257+
"F=\"%s&var-include=%s\"><I>Link to transfers " +
3258+
"in Grafana FTS dashboard</I></A>\n") %
3259+
((LFTCH_FTSDASHB % (sTIS, eTIS)),
3260+
siteDocs[site]['name']))
3261+
myFile.write("</TABLE>\n\n")
32463262
myFile.write("<P>\n<HR>\n\n")
32473263
#
32483264
# write source host evaluation tables:
@@ -3294,14 +3310,13 @@ def lftch_maindvi_links(cfg, docs):
32943310
time.strftime("%Y-%m-%d %H:%M:%S",
32953311
time.gmtime(int(srcDocs[source]['***VERSION***']/1000))),
32963312
clss, srcDocs[source]['***DOCID***']))
3297-
if ( srcDocs[source]['status'] != "unknown" ):
3298-
sTIS = tbin * cfg['period']
3299-
eTIS = sTIS + cfg['period']
3300-
myFile.write((" <TR>\n <TD COLSPAN=\"2\"><A" +
3301-
" HREF=\"%s\"><I>Link to transfers in Graf" +
3302-
"ana FTS dashboard</I></A>\n") %
3303-
(LFTCH_FTSDASHB % (sTIS, eTIS, "src_hostname",
3304-
srcDocs[source]['name'])))
3313+
sTIS = tbin * cfg['period']
3314+
eTIS = sTIS + cfg['period']
3315+
myFile.write((" <TR>\n <TD COLSPAN=\"2\"><A HRE" +
3316+
"F=\"%s&var-filters=src_hostname|=|%s\"><I>Lin" +
3317+
"k to transfers in Grafana FTS dashboard</I></" +
3318+
"A>\n") % ((LFTCH_FTSDASHB % (sTIS, eTIS)),
3319+
srcDocs[source]['name']))
33053320
myFile.write("</TABLE>\n\n")
33063321
myFile.write("<P>\n<HR>\n\n")
33073322
#
@@ -3354,14 +3369,13 @@ def lftch_maindvi_links(cfg, docs):
33543369
time.strftime("%Y-%m-%d %H:%M:%S",
33553370
time.gmtime(int(dstDocs[dest]['***VERSION***']/1000))),
33563371
clss, dstDocs[dest]['***DOCID***']))
3357-
if ( dstDocs[dest]['status'] != "unknown" ):
3358-
sTIS = tbin * cfg['period']
3359-
eTIS = sTIS + cfg['period']
3360-
myFile.write((" <TR>\n <TD COLSPAN=\"2\"><A" +
3361-
" HREF=\"%s\"><I>Link to transfers in Graf" +
3362-
"ana FTS dashboard</I></A>\n") %
3363-
(LFTCH_FTSDASHB % (sTIS, eTIS, "dst_hostname",
3364-
dstDocs[dest]['name'])))
3372+
sTIS = tbin * cfg['period']
3373+
eTIS = sTIS + cfg['period']
3374+
myFile.write((" <TR>\n <TD COLSPAN=\"2\"><A HRE" +
3375+
"F=\"%s&var-filters=dst_hostname|=|%s\"><I>Lin" +
3376+
"k to transfers in Grafana FTS dashboard</I></" +
3377+
"A>\n") % ((LFTCH_FTSDASHB % (sTIS, eTIS)),
3378+
dstDocs[dest]['name']))
33653379
myFile.write("</TABLE>\n\n")
33663380
myFile.write("<P>\n<HR>\n\n")
33673381
#

‎cmssst/www/cgi-bin/log_getter.py‎

Lines changed: 47 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1888,7 +1888,7 @@ def lget_maindvi_fts(cfg, docs):
18881888
# ################################################################ #
18891889
# prepare mainDVI section with CMS FTS evaluation according to cfg #
18901890
# ################################################################ #
1891-
LGET_FTSDASHB = "https://monit-grafana.cern.ch/d/000000420/fts-transfers-30-days?orgId=20&from=%d000&to=%d000&var-group_by=endpnt&var-vo=cms&var-src_country=All&var-dst_country=All&var-src_site=All&var-dst_site=All&var-fts_server=All&var-bin=$__auto_interval_bin&var-filters=%s|=|%s"
1891+
LGET_FTSDASHB = "https://monit-grafana.cern.ch/d/000000420/fts-transfers-30-days?orgId=20&from=%d000&to=%d000&var-group_by=endpnt&var-vo=cms&var-src_country=All&var-dst_country=All&var-src_site=All&var-dst_site=All&var-fts_server=All&var-bin=$__auto_interval_bin"
18921892
#
18931893
siteRegex = re.compile(r"T\d_[A-Z]{2,2}_\w+")
18941894

@@ -2044,20 +2044,29 @@ def lget_maindvi_fts(cfg, docs):
20442044
"ent id\n <TD BGCOLOR=\"%s\" N" +
20452045
"OWRAP>%s\n") %
20462046
(myColour, myDoc['***DOCID***']))
2047-
if (( myDoc['status'] != "unknown" ) and
2048-
(( myDoc['type'] == "destination" ) or
2049-
( myDoc['type'] == "source" ))):
2050-
sTIS = tbin * cfg['period']
2051-
eTIS = sTIS + cfg['period']
2052-
if ( myDoc['type'] == "destination" ):
2053-
sKEY = "dst_hostname"
2054-
else:
2055-
sKEY = "src_hostname"
2047+
sTIS = tbin * cfg['period']
2048+
eTIS = sTIS + cfg['period']
2049+
if ( myDoc['type'] == "site" ):
20562050
myFile.write((" <TR>\n <TD COLSPAN=" +
2057-
"\"2\"><A HREF=\"%s\"><I>Link to t" +
2058-
"ransfers in Grafana FTS dashboard" +
2059-
"</I></A>\n") % (LGET_FTSDASHB %
2060-
(sTIS, eTIS, sKEY, myDoc['name'])))
2051+
"\"2\"><A HREF=\"%s&var-include=%s" +
2052+
"\"><I>Link to transfers in Grafan" +
2053+
"a FTS dashboard</I></A>\n") %
2054+
((LGET_FTSDASHB % (sTIS, eTIS)),
2055+
myDoc['name']))
2056+
elif ( myDoc['type'] == "destination" ):
2057+
myFile.write((" <TR>\n <TD COLSPAN=" +
2058+
"\"2\"><A HREF=\"%s&var-filters=ds" +
2059+
"t_hostname|=|%s\"><I>Link to tran" +
2060+
"sfers in Grafana FTS dashboard</I" +
2061+
"></A>\n") % ((LGET_FTSDASHB %
2062+
(sTIS, eTIS)), myDoc['name']))
2063+
elif ( myDoc['type'] == "source" ):
2064+
myFile.write((" <TR>\n <TD COLSPAN=" +
2065+
"\"2\"><A HREF=\"%s&var-filters=sr" +
2066+
"c_hostname|=|%s\"><I>Link to tran" +
2067+
"sfers in Grafana FTS dashboard</I" +
2068+
"></A>\n") % ((LGET_FTSDASHB %
2069+
(sTIS, eTIS)), myDoc['name']))
20612070
myFile.write(" </TABLE>\n <BR>\n")
20622071
else:
20632072
myFile.write(" <TD>&nbsp;\n")
@@ -2387,7 +2396,7 @@ def lget_maindvi_links(cfg, docs):
23872396
# ################################################################## #
23882397
# prepare mainDVI section with CMS Link evaluations according to cfg #
23892398
# ################################################################## #
2390-
LGET_FTSDASHB = "https://monit-grafana.cern.ch/d/000000420/fts-transfers-30-days?orgId=20&from=%d000&to=%d000&var-group_by=endpnt&var-vo=cms&var-src_country=All&var-dst_country=All&var-src_site=All&var-dst_site=All&var-fts_server=All&var-bin=$__auto_interval_bin&var-filters=%s|=|%s"
2399+
LGET_FTSDASHB = "https://monit-grafana.cern.ch/d/000000420/fts-transfers-30-days?orgId=20&from=%d000&to=%d000&var-group_by=endpnt&var-vo=cms&var-src_country=All&var-dst_country=All&var-src_site=All&var-dst_site=All&var-fts_server=All&var-bin=$__auto_interval_bin"
23912400
#
23922401
siteRegex = re.compile(r"T\d_[A-Z]{2,2}_\w+")
23932402

@@ -2726,8 +2735,7 @@ def lget_maindvi_links(cfg, docs):
27262735
">\n <TH CLASS=\"Description\">Version numbe" +
27272736
"r<br>(= insert time)\n <TD CLASS=\"%s\">%d." +
27282737
"%3.3d (%s UTC)\n<TR>\n <TH CLASS=\"Descript" +
2729-
"ion\">Document id\n <TD CLASS=\"%s\">%s\n</" +
2730-
"TABLE>\n\n") %
2738+
"ion\">Document id\n <TD CLASS=\"%s\">%s\n") %
27312739
(site, site, clss, siteDocs[site]['name'],
27322740
clss, siteDocs[site]['type'],
27332741
clss, q_strng,
@@ -2738,6 +2746,14 @@ def lget_maindvi_links(cfg, docs):
27382746
time.strftime("%Y-%m-%d %H:%M:%S",
27392747
time.gmtime(int(siteDocs[site]['***VERSION***']/1000))),
27402748
clss, siteDocs[site]['***DOCID***']))
2749+
sTIS = tbin * cfg['period']
2750+
eTIS = sTIS + cfg['period']
2751+
myFile.write(("<TR>\n <TD COLSPAN=" + "\"2\"><A HREF=\"%s&" +
2752+
"var-include=%s\"><I>Link to transfers in Graf" +
2753+
"ana FTS dashboard</I></A>\n") %
2754+
((LGET_FTSDASHB % (sTIS, eTIS)),
2755+
siteDocs[site]['name']))
2756+
myFile.write("</TABLE>\n\n")
27412757
myFile.write("<P>\n<HR>\n\n")
27422758
#
27432759
# write source host evaluation tables:
@@ -2789,13 +2805,13 @@ def lget_maindvi_links(cfg, docs):
27892805
time.strftime("%Y-%m-%d %H:%M:%S",
27902806
time.gmtime(int(srcDocs[source]['***VERSION***']/1000))),
27912807
clss, srcDocs[source]['***DOCID***']))
2792-
if ( srcDocs[source]['status'] != "unknown" ):
2793-
sTIS = tbin * cfg['period']
2794-
eTIS = sTIS + cfg['period']
2795-
myFile.write(("<TR>\n <TD COLSPAN=" + "\"2\"><A HREF=" +
2796-
"\"%s\"><I>Link to transfers in Grafana FT" +
2797-
"S dashboard</I></A>\n") % (LGET_FTSDASHB %
2798-
(sTIS, eTIS, "src_hostname", srcDocs[source]['name'])))
2808+
sTIS = tbin * cfg['period']
2809+
eTIS = sTIS + cfg['period']
2810+
myFile.write(("<TR>\n <TD COLSPAN=" + "\"2\"><A HREF=\"%s&" +
2811+
"var-filters=src_hostname|=|%s\"><I>Link to tr" +
2812+
"ansfers in Grafana FTS dashboard</I></A>\n") %
2813+
((LGET_FTSDASHB % (sTIS, eTIS)),
2814+
srcDocs[source]['name']))
27992815
myFile.write("</TABLE>\n\n")
28002816
myFile.write("<P>\n<HR>\n\n")
28012817
#
@@ -2848,13 +2864,13 @@ def lget_maindvi_links(cfg, docs):
28482864
time.strftime("%Y-%m-%d %H:%M:%S",
28492865
time.gmtime(int(dstDocs[dest]['***VERSION***']/1000))),
28502866
clss, dstDocs[dest]['***DOCID***']))
2851-
if ( dstDocs[dest]['status'] != "unknown" ):
2852-
sTIS = tbin * cfg['period']
2853-
eTIS = sTIS + cfg['period']
2854-
myFile.write(("<TR>\n <TD COLSPAN=" + "\"2\"><A HREF=" +
2855-
"\"%s\"><I>Link to transfers in Grafana FT" +
2856-
"S dashboard</I></A>\n") % (LGET_FTSDASHB %
2857-
(sTIS, eTIS, "dst_hostname", dstDocs[dest]['name'])))
2867+
sTIS = tbin * cfg['period']
2868+
eTIS = sTIS + cfg['period']
2869+
myFile.write(("<TR>\n <TD COLSPAN=" + "\"2\"><A HREF=\"%s&" +
2870+
"var-filters=dst_hostname|=|%s\"><I>Link to tr" +
2871+
"ansfers in Grafana FTS dashboard</I></A>\n") %
2872+
((LGET_FTSDASHB % (sTIS, eTIS)),
2873+
dstDocs[dest]['name']))
28582874
myFile.write("</TABLE>\n\n")
28592875
myFile.write("<P>\n<HR>\n\n")
28602876
#

0 commit comments

Comments
 (0)