Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit b2dbe55
Author: Arne Tarara <[email protected]>
Date:   Thu Jul 21 20:34:33 2022 +0200

    Currently co2 is only CPU Package

commit 197ce44
Author: Arne Tarara <[email protected]>
Date:   Thu Jul 21 08:31:15 2022 +0200

    Removed showcases from everywhere, but added new CSS for formula styling

commit 5dbac6c
Author: Arne Tarara <[email protected]>
Date:   Wed Jul 20 10:57:36 2022 +0200

    Word wrap now with newer W3C specification overflow-wrap

commit 14f96b5
Author: Arne Tarara <[email protected]>
Date:   Wed Jul 20 10:39:47 2022 +0200

    Removed unused CSS

commit 9dd9b5b
Author: Arne Tarara <[email protected]>
Date:   Wed Jul 20 10:17:45 2022 +0200

    Loading replaced with proper placeholder text

commit 0e0294e
Merge: 393d31b 9b3427d
Author: Arne Tarara <[email protected]>
Date:   Mon Jul 18 21:02:21 2022 +0200

    Merge branch 'main' into dev

    * main:
      Squashed commit of the following:
      Added favicon
      Removed CSS transition for all. Only menu should transition
      Removed unused files

commit 393d31b
Author: Arne Tarara <[email protected]>
Date:   Mon Jul 18 19:00:40 2022 +0200

    Bug in CO2 calculations; Added mem_avg

commit 6ceee36
Author: Arne Tarara <[email protected]>
Date:   Mon Jul 18 18:20:41 2022 +0200

    new wording for last crawl -> last run

commit 0473bd4
Merge: c0ca444 51a6baf
Author: Arne Tarara <[email protected]>
Date:   Mon Jul 18 13:41:58 2022 +0200

    Merge branch 'main' into dev

    * main:
      Added categories to structure.sql
      Providing more sensible defaults for config.yml.example
      Squashed commit of the following:

commit c0ca444
Merge: 5158a2d 02e80ac
Author: Arne Tarara <[email protected]>
Date:   Mon Jul 18 13:09:07 2022 +0200

    Merge branch 'main' into dev

    * main:
      Backported the usage_scenario.yml change from dev

commit 5158a2d
Author: Arne Tarara <[email protected]>
Date:   Sun Jul 17 20:59:07 2022 +0200

    Put .tab call to different place. Removed raised

commit f3266fd
Author: Arne Tarara <[email protected]>
Date:   Sun Jul 17 14:32:35 2022 +0200

    Fixed usage_scenario display and CO2 calculations

commit f56c0fc
Author: Arne Tarara <[email protected]>
Date:   Sun Jul 17 12:52:02 2022 +0200

    Frontend finally ready

commit e1dc46e
Merge: ef817c7 4bc4ac2
Author: Arne Tarara <[email protected]>
Date:   Sat Jul 16 11:03:00 2022 +0200

    Merge branch 'dev' into fomantic-dygraphs

    * dev:
      Metric Reporters without a container_id will always report as [SYSTEM]. Also unified handling
      Runner is now silent if error on container / network remove
      Added category table for background
      Added cgroup time reporter

commit 4bc4ac2
Author: Arne Tarara <[email protected]>
Date:   Sat Jul 16 11:02:39 2022 +0200

    Metric Reporters without a container_id will always report as [SYSTEM]. Also unified handling

commit 3efd611
Author: Arne Tarara <[email protected]>
Date:   Sat Jul 16 11:02:10 2022 +0200

    Runner is now silent if error on container / network remove

commit 5c80f91
Author: Arne Tarara <[email protected]>
Date:   Sat Jul 16 11:01:47 2022 +0200

    Added category table for background

commit 70f37ce
Author: Arne Tarara <[email protected]>
Date:   Sat Jul 16 11:01:06 2022 +0200

    Added cgroup time reporter

commit ef817c7
Author: Arne Tarara <[email protected]>
Date:   Sat Jul 16 11:00:32 2022 +0200

    More stats updated

commit 5c3fdb6
Merge: c3c66bb 01059d8
Author: Arne Tarara <[email protected]>
Date:   Fri Jul 15 20:45:58 2022 +0200

    Merge branch 'dev' into fomantic-dygraphs

    * dev:
      error handling in bashed less verbose and rm now -f
      set euxo removed for the moment
      If no metrics where imported an error is thrown. Also refactored naming STDOUT of classes
      Refactoring of config class to only read from filesystem once
      Comments also changed to .yml for the usage_scenario
      Yaml scenario (#15)
      tmp directory for gunicorn is now on /dev/shm for speed reasons
      Gunicorn now fully logging to STDOUT
      Clarification about which type of volume mount we use

commit c3c66bb
Author: Arne Tarara <[email protected]>
Date:   Fri Jul 15 20:43:14 2022 +0200

    Some styling and DB fixes

commit 6a3f177
Author: Arne Tarara <[email protected]>
Date:   Fri Jul 15 20:25:45 2022 +0200

    WIP

commit 0000b9a
Author: Arne Tarara <[email protected]>
Date:   Fri Jul 15 13:36:33 2022 +0200

    WIP

commit 82e79d8
Author: Arne Tarara <[email protected]>
Date:   Thu Jul 14 23:31:32 2022 +0200

    Initial cleaning

commit 01059d8
Merge: ea10172 7409167
Author: Arne Tarara <[email protected]>
Date:   Thu Jul 14 19:33:56 2022 +0200

    Merge branch 'main' into dev

    * main:
      error handling in bashed less verbose and rm now -f

commit 0bc34a0
Author: Arne Tarara <[email protected]>
Date:   Thu Jul 14 19:29:46 2022 +0200

    Apexcharts done; echarts WIP

commit 55a23cc
Author: Arne Tarara <[email protected]>
Date:   Thu Jul 14 17:28:21 2022 +0200

    WIP

commit 171b93d
Author: Arne Tarara <[email protected]>
Date:   Thu Jul 14 14:05:17 2022 +0200

    Moved new tempalte to all files

commit ad8a43d
Author: Arne Tarara <[email protected]>
Date:   Thu Jul 14 14:05:05 2022 +0200

    Fixed wrong grouping and params supply

commit 1193a78
Author: Arne Tarara <[email protected]>
Date:   Thu Jul 14 14:04:40 2022 +0200

    Removed changes that are not part of this branch

commit 420d792
Author: Arne Tarara <[email protected]>
Date:   Thu Jul 14 13:36:18 2022 +0200

    Added Showcases

commit fd16754
Author: Arne Tarara <[email protected]>
Date:   Thu Jul 14 13:29:58 2022 +0200

    Merged frontend design

commit cc4558d
Author: Alexandre <[email protected]>
Date:   Wed Jul 13 17:33:57 2022 +0200

    add extra measurements to db schema, api, stats

commit ea10172
Merge: 68f4241 1d647bb
Author: Arne Tarara <[email protected]>
Date:   Wed Jul 13 16:08:47 2022 +0200

    Merge branch 'dev' of github.com:green-coding-berlin/green-metrics-tool into dev

    * 'dev' of github.com:green-coding-berlin/green-metrics-tool:
      If no metrics where imported an error is thrown. Also refactored naming STDOUT of classes

commit 68f4241
Author: Arne Tarara <[email protected]>
Date:   Wed Jul 13 16:08:20 2022 +0200

    set euxo removed for the moment

commit 1d647bb
Author: Arne Tarara <[email protected]>
Date:   Wed Jul 13 16:04:25 2022 +0200

    If no metrics where imported an error is thrown. Also refactored naming STDOUT of classes

commit a7c6759
Author: Arne Tarara <[email protected]>
Date:   Wed Jul 13 15:26:13 2022 +0200

    Refactoring of config class to only read from filesystem once

commit a645575
Author: Arne Tarara <[email protected]>
Date:   Wed Jul 13 12:49:09 2022 +0200

    Comments also changed to .yml for the usage_scenario

commit 489e657
Author: Alexandre Oliveira <[email protected]>
Date:   Wed Jul 13 12:44:45 2022 +0200

    Yaml scenario (#15)

    * WIP

    * change from json to yaml

commit e29b1bb
Merge: 854ca96 556eb07
Author: Arne Tarara <[email protected]>
Date:   Wed Jul 13 09:37:25 2022 +0200

    Merge branch 'main' into dev

    * main:
      tmp directory for gunicorn is now on /dev/shm for speed reasons
      Gunicorn now fully logging to STDOUT
      Clarification about which type of volume mount we use

commit 35c6952
Author: Alexandre <[email protected]>
Date:   Tue Jul 12 18:13:23 2022 +0200

    change gradient colour from the menu

commit e1c8023
Author: Alexandre <[email protected]>
Date:   Tue Jul 12 17:23:07 2022 +0200

    move inline css from remaining html files into css file

commit 1afbe6c
Author: Alexandre <[email protected]>
Date:   Tue Jul 12 17:13:48 2022 +0200

    replicate inline css removal in all files

commit d15e6b4
Author: Alexandre <[email protected]>
Date:   Tue Jul 12 16:23:07 2022 +0200

    move inline css into css file

commit 2bb43b3
Author: Alexandre <[email protected]>
Date:   Tue Jul 12 15:24:27 2022 +0200

    refactor code

commit 9134254
Author: Alexandre <[email protected]>
Date:   Tue Jul 12 13:46:15 2022 +0200

    update compare and multi to Fomantic UI

commit d05defa
Author: Alexandre <[email protected]>
Date:   Tue Jul 12 13:32:22 2022 +0200

    add compare-old.html and multi-old.html

commit 0c46af0
Author: Alexandre <[email protected]>
Date:   Tue Jul 12 13:27:39 2022 +0200

    fix multiple layout issues

commit 7c55c56
Author: Alexandre <[email protected]>
Date:   Mon Jul 11 18:52:11 2022 +0200

    add dygraph.css

commit d7616a8
Author: Alexandre <[email protected]>
Date:   Mon Jul 11 18:18:06 2022 +0200

    fix createChartContainer() to show 'Show notes' only on the first node

commit 36b552f
Author: Alexandre <[email protected]>
Date:   Mon Jul 11 18:08:54 2022 +0200

    fix id placement on createChartContainer()

commit 8ce8076
Author: Alexandre <[email protected]>
Date:   Mon Jul 11 16:22:36 2022 +0200

    fix bug related to series having name = null

commit 2138e43
Author: Alexandre <[email protected]>
Date:   Mon Jul 11 16:22:05 2022 +0200

    fix bug related to series having name = null

commit 11195f8
Author: Alexandre <[email protected]>
Date:   Mon Jul 11 15:03:03 2022 +0200

    replace node cloning by node creation

commit 27cb085
Author: Alexandre <[email protected]>
Date:   Mon Jul 11 14:43:00 2022 +0200

    add twoCards div to every pair of charts

commit 854ca96
Merge: 60d93c4 d56686a
Author: Arne Tarara <[email protected]>
Date:   Sun Jul 10 12:30:57 2022 +0200

    Merge branch 'main' into dev

    * main:
      Bash error blocking added

commit 60d93c4
Author: Arne Tarara <[email protected]>
Date:   Sun Jul 10 09:27:22 2022 +0200

    More explicit call to email_helpers

commit 0030b2a
Author: Arne Tarara <[email protected]>
Date:   Sun Jul 10 08:33:30 2022 +0200

    Resolution can now be set in the config.yml

commit 994fdbe
Merge: 0e87872 fa3b2e3
Author: Arne Tarara <[email protected]>
Date:   Sat Jul 9 23:00:40 2022 +0200

    Merge branch 'main' into dev

    * main:
      Install script now updated DB PW also

commit 0e87872
Merge: b9ffd05 e25f7af
Author: Arne Tarara <[email protected]>
Date:   Sat Jul 9 22:50:18 2022 +0200

    Merge branch 'main' into dev

    * main:
      Install.sh now creates and replaces the compose.yml
      Install script now added
      Install script renamed to the suprising name of install.sh
      Install script (#11)
      Squashed commit of the following:
      using one underscore now, cause it is PEP8
      Removed old documentation
      Changed link to data-analysis and moved deepnote links to top

commit b9ffd05
Author: Arne Tarara <[email protected]>
Date:   Sat Jul 9 14:46:10 2022 +0200

    Renamed reporters to now hopefully future proof naming convention including containers / system; Bugifx in install.sh for new correct paths; added measurement as indent to the config.yml.example

commit 8364dda
Author: Arne Tarara <[email protected]>
Date:   Sat Jul 9 14:43:43 2022 +0200

    Removed note coalescing with time

commit 7695005
Author: Arne Tarara <[email protected]>
Date:   Sat Jul 9 14:29:32 2022 +0200

    Wrong folder specified in install.sh

commit 5804ac1
Author: Arne Tarara <[email protected]>
Date:   Sat Jul 9 14:19:26 2022 +0200

    Removed bogus test file

commit 8dc457d
Author: Arne Tarara <[email protected]>
Date:   Fri Jul 8 20:46:10 2022 +0200

    Many print debug help around unsafe mode and inverting boolean check error

commit deb0646
Author: Alexandre <[email protected]>
Date:   Fri Jul 8 17:52:18 2022 +0200

    API now returning only needed fields for note endpoint

commit 152555e
Author: Alexandre <[email protected]>
Date:   Fri Jul 8 17:42:14 2022 +0200

    copied in the changes from the trees and miles branch manually

commit 387a652
Author: Arne Tarara <[email protected]>
Date:   Fri Jul 8 17:28:56 2022 +0200

    First merge of dygraphs into dev

commit 76b209a
Author: Arne Tarara <[email protected]>
Date:   Fri Jul 8 17:03:03 2022 +0200

    Barely minimum code working regarding chart display for apex charts. Roll back to this one if you need the ApexCharts again

commit 2471da7
Author: Arne Tarara <[email protected]>
Date:   Fri Jul 8 16:24:50 2022 +0200

    match expression removed

commit 3eb11c3
Author: Arne Tarara <[email protected]>
Date:   Fri Jul 8 16:16:38 2022 +0200

    Make fix for older C version regarding char statement

commit ba8b130
Author: Arne Tarara <[email protected]>
Date:   Fri Jul 8 14:40:38 2022 +0200

    Removed less code and metadata

commit 5fbbe13
Author: Arne Tarara <[email protected]>
Date:   Fri Jul 8 14:20:23 2022 +0200

    Merged in again Dans changes regarding the multi/compare feature; new file with CSS styles added

commit 029afde
Author: Alexandre Oliveira <[email protected]>
Date:   Fri Jul 8 12:31:13 2022 +0200

    Fomantic (#12)

    * initial commit

    * add home

    * rename request and stats to -old

    * add request.hml

    * add request

    * add stats.html

    * add data_analysis.html

    * add data_analysis

    * add stats

    * add 'two cards' class

    * remove Material Dashboard classes

    * fix width

    * fix menu width

    * add icons, burger menu, change colours

    * add layout to all pages

    * fix layout issues

    * deleted unnecessary files, moved assets

    * add Data Analysis margin-bottom

    * add Data Analysis margin-bottom

    Co-authored-by: Arne Tarara <[email protected]>

commit 22238c9
Author: Arne Tarara <[email protected]>
Date:   Fri Jul 8 09:48:20 2022 +0200

    Squashed commit of the following:

    commit e34d79b
    Merge: 45c1d1e 695ff17
    Author: Arne Tarara <[email protected]>
    Date:   Fri Jul 8 09:47:07 2022 +0200

        Merge branch 'compare-feature' of github.com:green-coding-berlin/green-metrics-tool into compare-feature

        * 'compare-feature' of github.com:green-coding-berlin/green-metrics-tool:
          removed more unnecessary html, to begin with a clean slate
          added compare functionality to the list of projects, which redirects you to the correct comparision page and fetchs the stats data for the selected projects
          added /compare endpoint
          Removed old documentation
          Changed link to data-analysis and moved deepnote links to top
          Test for Dan
          add compareButton() and group compare call by container
          added compare api call, started front end of compare feature

    commit 45c1d1e
    Author: Arne Tarara <[email protected]>
    Date:   Thu Jun 30 18:03:34 2022 +0200

        Test for Dan

    commit b5ff011
    Author: Dan M <[email protected]>
    Date:   Wed Jul 6 11:13:54 2022 +0200

        removed more unnecessary html, to begin with a clean slate

    commit a5e20ce
    Author: Dan M <[email protected]>
    Date:   Tue Jul 5 11:14:52 2022 +0200

        added compare functionality to the list of projects, which redirects you to the correct comparision page and fetchs the stats data for the selected projects

    commit d34f989
    Author: Dan M <[email protected]>
    Date:   Tue Jul 5 11:12:43 2022 +0200

        added /compare endpoint

    commit 9df2a05
    Author: Dan M <[email protected]>
    Date:   Thu Jun 30 11:43:05 2022 +0200

        add compareButton() and group compare call by container

    commit c121a14
    Author: Dan M <[email protected]>
    Date:   Thu Jun 30 09:44:40 2022 +0200

        added compare api call, started front end of compare feature

    commit 695ff17
    Merge: 7da1730 616df33
    Author: Dan M <[email protected]>
    Date:   Wed Jul 6 11:17:53 2022 +0200

        Merge branch 'compare-feature' of github.com:green-coding-berlin/green-metrics-tool into compare-feature

    commit 7da1730
    Author: Dan M <[email protected]>
    Date:   Wed Jul 6 11:13:54 2022 +0200

        removed more unnecessary html, to begin with a clean slate

    commit d4e2398
    Merge: c00cd95 8a4fcab
    Author: Dan M <[email protected]>
    Date:   Wed Jul 6 11:06:11 2022 +0200

        Merge branch 'main' of github.com:green-coding-berlin/green-metrics-tool into compare-feature

    commit c00cd95
    Author: Dan M <[email protected]>
    Date:   Tue Jul 5 11:14:52 2022 +0200

        added compare functionality to the list of projects, which redirects you to the correct comparision page and fetchs the stats data for the selected projects

    commit 6af11a7
    Author: Dan M <[email protected]>
    Date:   Tue Jul 5 11:12:43 2022 +0200

        added /compare endpoint

    commit 8a4fcab
    Author: Arne Tarara <[email protected]>
    Date:   Mon Jul 4 18:21:37 2022 +0200

        Removed old documentation

    commit ecbdd66
    Author: Arne Tarara <[email protected]>
    Date:   Mon Jul 4 18:16:59 2022 +0200

        Changed link to data-analysis and moved deepnote links to top

    commit 2f4e2da
    Merge: aa238d3 56dd0eb
    Author: Dan M <[email protected]>
    Date:   Mon Jul 4 13:28:43 2022 +0200

        Merge branch 'main' of github.com:green-coding-berlin/green-metrics-tool into compare-feature

    commit 616df33
    Author: Arne Tarara <[email protected]>
    Date:   Thu Jun 30 18:03:34 2022 +0200

        Test for Dan

    commit aa238d3
    Merge: 5a54021 51edb7d
    Author: Dan M <[email protected]>
    Date:   Thu Jun 30 14:32:39 2022 +0200

        Merge branch 'main' of github.com:green-coding-berlin/green-metrics-tool into compare-feature

    commit 5a54021
    Author: Dan M <[email protected]>
    Date:   Thu Jun 30 11:43:05 2022 +0200

        add compareButton() and group compare call by container

    commit 81d2820
    Author: Dan M <[email protected]>
    Date:   Thu Jun 30 09:44:40 2022 +0200

        added compare api call, started front end of compare feature

commit 85b6589
Author: Arne Tarara <[email protected]>
Date:   Fri Jul 8 09:26:33 2022 +0200

    Squashed commit of the following:

    commit 23180d1
    Author: Arne Tarara <[email protected]>
    Date:   Thu Jul 7 22:53:55 2022 +0200

        Removed value conversion from reporters

    commit 782d6e9
    Author: Arne Tarara <[email protected]>
    Date:   Thu Jul 7 22:35:19 2022 +0200

        note for clarification

    commit 1cf1f4c
    Author: Arne Tarara <[email protected]>
    Date:   Thu Jul 7 20:28:07 2022 +0200

        Complete refactoring of reporters and added time reporters done. Only conversion must be done of metric dimensions

    commit 5493c63
    Author: Arne Tarara <[email protected]>
    Date:   Thu Jul 7 15:24:46 2022 +0200

        Merge residue

    commit b38047d
    Merge: ebd4b10 e3f95dd
    Author: Arne Tarara <[email protected]>
    Date:   Thu Jul 7 15:23:18 2022 +0200

        Merge branch 'dev' into time-reporter

        * dev:
          Fixed logical bug in jobs.py and introduced last_run ; More refactorings to prepare for config as global Singleton
          Activated job-checking again; Some extra comments for clarification
          Heavy refactoring to make jobs.py work. Runner could not be called programmatically. Therefore made as class and decoupled email_errors, send_mail and made API work with global error handler
          Heavy refactoring to make jobs.py work. Runner could not be called programmatically. Therefore made as class and decoupled email_errors, send_mail and made API work with global error handler

    commit ebd4b10
    Author: Arne Tarara <[email protected]>
    Date:   Thu Jul 7 15:21:24 2022 +0200

        Proper include of StringIO

    commit e813e99
    Author: Arne Tarara <[email protected]>
    Date:   Thu Jul 7 15:18:45 2022 +0200

        Struct definition with static was confusing; changed metrics_subdir to new location

    commit 9fd7506
    Author: Arne Tarara <[email protected]>
    Date:   Thu Jul 7 15:10:40 2022 +0200

        metric-providers reappeared after rebase

    commit 5ddf8c8
    Merge: 55a97f7 1c2938e
    Author: Arne Tarara <[email protected]>
    Date:   Thu Jul 7 15:05:17 2022 +0200

        Merge branch 'time-reporter' of github.com:green-coding-berlin/green-metrics-tool into time-reporter

        * 'time-reporter' of github.com:green-coding-berlin/green-metrics-tool:
          More rework to allow SUDO
          Removed unneeded comments and converted tabs to spaces
          WIP
          Time reporter save commit
          Time reporter save commit

    commit 55a97f7
    Author: Arne Tarara <[email protected]>
    Date:   Thu Jul 7 12:02:23 2022 +0200

        More rework to allow SUDO

    commit ef657e7
    Author: Arne Tarara <[email protected]>
    Date:   Wed Jul 6 10:16:15 2022 +0200

        Removed unneeded comments and converted tabs to spaces

    commit eff5122
    Author: Arne Tarara <[email protected]>
    Date:   Thu Jul 7 15:04:42 2022 +0200

        Time reporter save commit

    commit bd79b4d
    Author: Arne Tarara <[email protected]>
    Date:   Wed Jul 6 09:33:58 2022 +0200

        WIP

    commit 032ef72
    Author: Arne Tarara <[email protected]>
    Date:   Thu Jul 7 15:03:41 2022 +0200

        Time reporter save commit

    commit 39478a1
    Author: Arne Tarara <[email protected]>
    Date:   Thu Jul 7 13:22:57 2022 +0200

        Install script now added

    commit a91818e
    Author: Arne Tarara <[email protected]>
    Date:   Thu Jul 7 13:17:30 2022 +0200

        Install script renamed to the suprising name of install.sh

    commit 9a67fa6
    Author: dan-mm <[email protected]>
    Date:   Thu Jul 7 12:37:23 2022 +0200

        Install script (#11)

        * initial commit of makefile install scripts

        * removed unnecessary line

        * wip

        * wip

        * using one underscore now, cause it is PEP8

        * updated make-metrics-providers to include /etc/hosts lines; slight refactor;

        * initial commit of makefile install scripts

        * removed unnecessary line

        * wip

        * wip

        * updated make-metrics-providers to include /etc/hosts lines; slight refactor;

        * removed static binaries, as they should be built via the install script

        * added static-binary to gitignore file

        * added verbose echo

        Co-authored-by: Dan M <[email protected]>
        Co-authored-by: Arne Tarara <[email protected]>

    commit 178725e
    Author: Arne Tarara <[email protected]>
    Date:   Thu Jul 7 12:33:30 2022 +0200

        Squashed commit of the following:

        commit 5c6cf5a
        Author: Dan M <[email protected]>
        Date:   Thu Jul 7 12:29:45 2022 +0200

            added verbose echo

        commit 0e9b3c5
        Author: Dan M <[email protected]>
        Date:   Thu Jul 7 12:29:04 2022 +0200

            added static-binary to gitignore file

        commit 87fa84f
        Author: Dan M <[email protected]>
        Date:   Thu Jul 7 12:20:31 2022 +0200

            removed static binaries, as they should be built via the install script

        commit 2e147f2
        Merge: 8703e76 0303948
        Author: Dan M <[email protected]>
        Date:   Thu Jul 7 12:13:39 2022 +0200

            Merge branch 'install-script' of github.com:green-coding-berlin/green-metrics-tool into install-script

        commit 8703e76
        Author: Dan M <[email protected]>
        Date:   Wed Jul 6 11:05:25 2022 +0200

            updated make-metrics-providers to include /etc/hosts lines; slight refactor;

        commit 4e3e6d0
        Author: Dan M <[email protected]>
        Date:   Thu Jun 30 15:27:42 2022 +0200

            wip

        commit d348814
        Author: Dan M <[email protected]>
        Date:   Thu Jun 30 11:51:30 2022 +0200

            wip

        commit 26187c3
        Author: Dan M <[email protected]>
        Date:   Mon Jun 27 15:20:43 2022 +0200

            removed unnecessary line

        commit c4e0aea
        Author: Dan M <[email protected]>
        Date:   Mon Jun 27 11:53:02 2022 +0200

            initial commit of makefile install scripts

        commit 0303948
        Author: Dan M <[email protected]>
        Date:   Wed Jul 6 11:05:25 2022 +0200

            updated make-metrics-providers to include /etc/hosts lines; slight refactor;

        commit 4e47014
        Merge: 46ee7f2 8a4fcab
        Author: Dan M <[email protected]>
        Date:   Tue Jul 5 11:15:20 2022 +0200

            Merge branch 'main' of github.com:green-coding-berlin/green-metrics-tool into install-script

        commit 46ee7f2
        Author: Dan M <[email protected]>
        Date:   Thu Jun 30 15:27:42 2022 +0200

            wip

        commit e3b232e
        Merge: add3da6 51edb7d
        Author: Dan M <[email protected]>
        Date:   Thu Jun 30 15:11:19 2022 +0200

            Merge branch 'main' of github.com:green-coding-berlin/green-metrics-tool into install-script

        commit add3da6
        Author: Dan M <[email protected]>
        Date:   Thu Jun 30 11:51:30 2022 +0200

            wip

        commit ca09107
        Author: Dan M <[email protected]>
        Date:   Mon Jun 27 15:20:43 2022 +0200

            removed unnecessary line

        commit 03a7fef
        Author: Dan M <[email protected]>
        Date:   Mon Jun 27 11:53:02 2022 +0200

            initial commit of makefile install scripts

    commit 1c2938e
    Author: Arne Tarara <[email protected]>
    Date:   Thu Jul 7 12:02:23 2022 +0200

        More rework to allow SUDO

    commit 7f112fe
    Author: Arne Tarara <[email protected]>
    Date:   Wed Jul 6 10:16:15 2022 +0200

        Removed unneeded comments and converted tabs to spaces

    commit 59bdb0d
    Merge: be58013 8e95c77
    Author: Arne Tarara <[email protected]>
    Date:   Wed Jul 6 09:55:11 2022 +0200

        Merge branch 'time-reporter' of github.com:green-coding-berlin/green-metrics-tool into time-reporter

        * 'time-reporter' of github.com:green-coding-berlin/green-metrics-tool:
          Time reporter save commit

    commit be58013
    Author: Arne Tarara <[email protected]>
    Date:   Wed Jul 6 09:33:58 2022 +0200

        WIP

    commit 5dd4975
    Author: Arne Tarara <[email protected]>
    Date:   Wed Jun 29 14:50:20 2022 +0200

        Time reporter save commit

    commit 406cf77
    Author: Arne Tarara <[email protected]>
    Date:   Tue Jul 5 13:48:12 2022 +0200

        using one underscore now, cause it is PEP8

    commit 8a4fcab
    Author: Arne Tarara <[email protected]>
    Date:   Mon Jul 4 18:21:37 2022 +0200

        Removed old documentation

    commit ecbdd66
    Author: Arne Tarara <[email protected]>
    Date:   Mon Jul 4 18:16:59 2022 +0200

        Changed link to data-analysis and moved deepnote links to top

    commit 8e95c77
    Author: Arne Tarara <[email protected]>
    Date:   Wed Jun 29 14:50:20 2022 +0200

        Time reporter save commit

commit 6aaec96
Author: Arne Tarara <[email protected]>
Date:   Sun Jul 3 17:21:41 2022 +0200

    Some bugfixing to make jobs run correctly: BaseException was catching keyboard, projects where not filtered to id, update must set time

commit e3f95dd
Author: Arne Tarara <[email protected]>
Date:   Sun Jul 3 17:06:04 2022 +0200

    Fixed logical bug in jobs.py and introduced last_run ; More refactorings to prepare for config as global Singleton

commit 2fbec5f
Merge: 8b81811 c86d361
Author: Arne Tarara <[email protected]>
Date:   Sun Jul 3 16:47:22 2022 +0200

    Merge branch 'dev' of github.com:green-coding-berlin/green-metrics-tool into dev

    * 'dev' of github.com:green-coding-berlin/green-metrics-tool:
      Heavy refactoring to make jobs.py work. Runner could not be called programmatically. Therefore made as class and decoupled email_errors, send_mail and made API work with global error handler

commit 8b81811
Author: Arne Tarara <[email protected]>
Date:   Sun Jul 3 16:45:55 2022 +0200

    Activated job-checking again; Some extra comments for clarification

commit e29e023
Author: Arne Tarara <[email protected]>
Date:   Sun Jul 3 16:36:27 2022 +0200

    Heavy refactoring to make jobs.py work. Runner could not be called programmatically. Therefore made as class and decoupled email_errors, send_mail and made API work with global error handler

commit c86d361
Author: Arne Tarara <[email protected]>
Date:   Sun Jul 3 16:36:27 2022 +0200

    Heavy refactoring to make jobs.py work. Runner could not be called programmatically. Therefore made as class and decoupled email_errors, send_mail and made API work with global error handler
  • Loading branch information
ArneTR committed Jul 21, 2022
1 parent 9b3427d commit a42370a
Show file tree
Hide file tree
Showing 12 changed files with 16 additions and 3,120 deletions.
4 changes: 0 additions & 4 deletions frontend/compare-old.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@
<a class="item" href="/data-analysis.html">
<b><i class="chart line icon"></i>Data Analysis</b>
</a>
<a class="item" href="/showcases.html">
<b><i class="glasses icon"></i>Showcases</b>
</a>

</div> <!-- end menu -->


Expand Down
3 changes: 0 additions & 3 deletions frontend/compare.html
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,6 @@
<a class="item" href="/data-analysis.html">
<b><i class="chart line icon"></i>Data Analysis</b>
</a>
<a class="item" href="/showcases.html">
<b><i class="glasses icon"></i>Showcases</b>
</a>
</div> <!-- end menu -->


Expand Down
Loading

0 comments on commit a42370a

Please sign in to comment.