[arvados] updated: 2.7.0-6014-g316b202c1c

git repository hosting git at public.arvados.org
Fri Feb 23 18:24:20 UTC 2024


Summary of changes:
 tools/crunchstat-summary/crunchstat_summary/summarizer.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

       via  316b202c1c91a777432d5c4697305e61c1afa972 (commit)
      from  2c3c89fef054c10fad443fb549d99b199a4aa452 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 316b202c1c91a777432d5c4697305e61c1afa972
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Fri Feb 23 13:24:00 2024 -0500

    19744: Fix single container report generation.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/tools/crunchstat-summary/crunchstat_summary/summarizer.py b/tools/crunchstat-summary/crunchstat_summary/summarizer.py
index 65cee6c176..03ce9d6c26 100644
--- a/tools/crunchstat-summary/crunchstat_summary/summarizer.py
+++ b/tools/crunchstat-summary/crunchstat_summary/summarizer.py
@@ -259,7 +259,16 @@ class Summarizer(object):
             self._recommend_gen(lambda x: "#!! "+x))) + "\n"
 
     def html_report(self):
-        return WEBCHART_CLASS(self.label, [self]).html()
+        tophtml = """{}\n<table class='aggtable'><tbody>{}</tbody></table>\n""".format(
+            "\n".join(self._recommend_gen(lambda x: "<p>{}</p>".format(x))),
+            "\n".join(self._text_report_agg_gen(lambda x: "<tr><th>{}</th><td>{}{}</td></tr>".format(*x))))
+
+        bottomhtml = """<table class='metricstable'><tbody>{}</tbody></table>\n""".format(
+            "\n".join(self._text_report_table_gen(lambda x: "<tr><th>{}</th><th>{}</th><th>{}</th><th>{}</th><th>{}</th></tr>".format(*x),
+                                                        lambda x: "<tr><td>{}</td><td>{}</td><td>{}</td><td>{}</td><td>{}</td></tr>".format(*x))))
+        label = self.long_label()
+
+        return WEBCHART_CLASS(label, [self]).html(tophtml, bottomhtml)
 
     def _text_report_table_gen(self, headerformat, rowformat):
         yield headerformat(['category', 'metric', 'task_max', 'task_max_rate', 'job_total'])

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list