101 Commits

Author SHA1 Message Date
Athanasius
f8245d8bc2
Merge pull request #184 from CommanderRoot/refactor/rm-deprecated-substr
refactor: replace deprecated String.prototype.substr()
2022-11-14 12:15:46 +00:00
Athanasius
53e099a9f4 contrib/eddn-logs-archive: Make non-verbose
This script has been proven for months, quieten it for potentially no
crontab output unless there's a problem.
2022-08-31 07:30:57 +00:00
Tobias Speicher
522189ec36
refactor: replace deprecated String.prototype.substr()
.substr() is deprecated so we replace it with .slice() which works similarily but isn't deprecated

Signed-off-by: Tobias Speicher <rootcommander@gmail.com>
2022-03-22 10:02:41 +01:00
Athanasius
df09dd064e
contrib/test-schema: Make this a little more useful
* Can now supply only the Schema file name to test its loading, without
  needing to supply a test data file as well.
* Added some status output, so it's more obvious when things worked.
2022-01-30 15:45:19 +00:00
Athanasius
c9b3dd3747
monitor: Update 'provided by' EDSM -> EDCD 2022-01-29 17:02:34 +00:00
Athanasius
3ffff54c4b contrib/eddn-logs-archive: Run gateway error report script on gateway.log
* Renamed some variables to be truer to their content and use.
* Run eddn-report-log-errors if rotating a gateway.log file.
2022-01-17 09:22:37 +00:00
Athanasius
f8c1ce7a3e Script for testing schemas 2021-11-07 16:22:14 +00:00
Athanasius
e82c241464 contrib/eddn-logs-archive: Optional --quiet arg
* Option --quiet arg to suppress no-error output.
* All the exit codes are in variables now.
2021-07-07 16:10:25 +00:00
Athanasius
3116927b12 run-from-source: Moved into new ./scripts/ directory 2021-07-06 10:04:55 +00:00
Athanasius
478bf4060b Move systemd scripts/files out of contrib into root 2021-07-06 10:03:31 +00:00
Athanasius
8f36f8dcfe contrib/run-from-source.sh: Fix up for the paths now used 2021-07-05 14:31:57 +00:00
Athanasius
1e9a5e6212 contrib: Rename logs-archive to eddn-logs-archive 2021-07-05 13:46:31 +00:00
Athanasius
f9cf414255 contrib: Log archival script
This will rotate to datetime stamped filenames (not a serial), and
compress.  Will also only keep 28 days of logs at most.
2021-07-05 13:42:51 +00:00
Athanasius
1476ff824d contrib/apache: Full, confirmed working, config 2021-07-05 12:56:25 +00:00
Athanasius
b1056c1239 contrib/run-from-source: Handle missing custom config 2021-07-03 14:02:35 +00:00
Athanasius
de761f653b contrib: Add LetsEncrypt example deploy script files 2021-07-02 17:34:29 +00:00
Athanasius
c72f583476 beta: Support in systemd start-eddn-service script 2021-07-02 14:17:21 +00:00
Athanasius
a340b027fc beta: Add systemd config 2021-07-02 14:16:36 +00:00
Athanasius
096ccab9fb docs/Running: Outline for using Apache 2021-07-01 17:30:48 +00:00
Athanasius
086493b5bf Make it possible to split dev and live installs
* Have 'dev' and 'live' components to many paths and file names.
* Have separate dev/live systemd start script configs.
* Have the systemd start script take a dev/live second argument.
* Try to ensure permissions on 'web' files by explicitly setting umask.
2021-07-01 16:52:25 +00:00
Athanasius
2c06b8e79e systemd: start script - exec the python 2021-06-14 17:34:34 +01:00
Athanasius
f98809fd2e systemd: Correct AssertPathExists to python venv 2021-06-14 17:32:13 +01:00
Athanasius
6bc7d3042d contrib/init.d: Tweak DAEMON setting for python venv install 2021-06-14 17:08:47 +01:00
Athanasius
4c2f379480 contrib/systemd: Adjusted service file and script for python venv 2021-06-14 15:52:39 +01:00
Athanasius
415f5bb17d systemd: Change to a single script for starting services
* Pass the EDDN service to be started as $1.
* eddn_config now defines a python venv activate script to use.
* And this new central script uses that.
2021-06-14 15:22:58 +01:00
Athanasius
04b28b61c0
Merge pull request #122 from EDCD/fix/118/schemaTodayYesterday-typo
monitor: Fix typo of schemasTodayYesterday with its 's' on 'schemas'
2021-06-14 13:01:39 +01:00
Athanasius
80a858fb26 monitor: Fix typo of schemasTodayYesterday with its 's' on 'schemas' 2021-06-14 12:47:54 +01:00
Athanasius
61bf062e9c Add example systemd unit files, and supporting files. 2021-06-14 12:27:21 +01:00
Athanasius
8d34c3335f Add contrib/run-from-source.sh
This allows for running the three components without first installing
them in any manner.  You can just git clone, configure (including
certificate files) and go.
2021-05-16 10:41:17 +01:00
AnthorNet
e4bc72abe9 Remove GA 2020-07-06 14:24:09 +02:00
Athanasius
d7d441b9e2 Escape ' when setting data-name attributes.
* "Garud's Test" was tripping this up.
 * It's just for how the table rows get referred to, no impact on the
   highlight into the HighChart.
2020-07-05 15:15:04 +01:00
Athanasius
a2638caed2 Also apply "it's zero" background to jsgrid-alt-row 2020-06-26 14:41:25 +01:00
Athanasius
576fe7ec29 Silence console.log on softwaresJsGridDataController 2020-06-25 14:09:02 +01:00
Athanasius
cc68fbc644 Squashed commit of the following:
commit 84c75c17f76cff7e576402dd2a77eb52717e3758
Author: Athanasius <gitlab@miggy.org>
Date:   Wed Jun 24 20:00:58 2020 +0100

    Software jsGrid now uses cached data when sorting/drill changed

commit a9ed1d902c8301d62348eaa684eda5010a846ca1
Author: Athanasius <gitlab@miggy.org>
Date:   Wed Jun 24 16:49:47 2020 +0100

    Convert Schemas to jsGrid

commit 26fe4a7e0c997d71411d5159adafad24cff5dc74
Author: Athanasius <gitlab@miggy.org>
Date:   Wed Jun 24 16:20:57 2020 +0100

    Change schemas HTML to just div.tables

commit 45c86a901f8627a23f9b5c573b15c615cff40d8f
Author: Athanasius <gitlab@miggy.org>
Date:   Wed Jun 24 16:19:34 2020 +0100

    Remove defunct Uploaders section from index.html

commit 3680197f86c805a1472f2538f3135c8698201f4d
Author: Athanasius <gitlab@miggy.org>
Date:   Wed Jun 24 15:43:34 2020 +0100

    Style today/yesterday "0" as per boostrap td.warning

      The elements/classes/IDs are different so can't just have it use
    the actual bootstrap CSS.

commit ef855586305033854a3e74663f607c3ff68d3534
Author: Athanasius <gitlab@miggy.org>
Date:   Wed Jun 24 15:17:20 2020 +0100

    Sanitises producing the Softwares data array

      We were first making a dictionary only to immediately use it to make an
    array for jsgrid/highcharts to use, then never using the dictionary
    again.
      So, just generate the array to start with, no intermediate step.

      This also sanitised some of the variable names so it's more obvious
    what data they hold.

commit d5be067bb3bbe8837909e437f6ed099c65f66be7
Author: Athanasius <gitlab@miggy.org>
Date:   Tue Jun 23 20:10:20 2020 +0100

    Set padding on td elements to get size correct

      No need for that 37px line-height, it was a consequence of this
    padding on non-jsgrid table cells.

commit 109540131361cb6b44f55c506d913da6d43f3af2
Author: Athanasius <gitlab@miggy.org>
Date:   Tue Jun 23 19:58:32 2020 +0100

    Clicking back out of Software drilldown working

      * Also fixes CSS so all jsgrid rows are that 37px height.

commit f4c27fb53b33c3c28b7ad60b8e908a5dc330cce5
Author: Athanasius <gitlab@miggy.org>
Date:   Tue Jun 23 19:39:02 2020 +0100

    'side square' colouring on sorts and drilldown

commit 6c79f4b92bf1f9c73f760588e78ff874db2254a6
Author: Athanasius <gitlab@miggy.org>
Date:   Tue Jun 23 18:43:53 2020 +0100

    Drilldown *in* for Software -> Versions now works

commit 353b379d5a49aab826908f2c95f758d5fdd0114e
Author: Athanasius <gitlab@miggy.org>
Date:   Tue Jun 23 17:56:54 2020 +0100

    Starts work on displaying software -> version table drilldowns

      if/else in place, and the else handling the software*names*/totals
    table still works.

commit fe2f6f0e73787512c8b5ca511871792a393894ce
Author: Athanasius <gitlab@miggy.org>
Date:   Tue Jun 23 16:58:32 2020 +0100

    Sort order on different column is now the same as on previous column

      If we start on Today/Ascending then:

    	Yesterday -> Yesterday/Asc
    	Total     -> Total/Asc
    	Total     -> Total/Desc
    	Today     -> Today/Desc
    	Today     -> Today/Asc
    	Yesterday -> Yesterday/Asc
    	Total     -> Total/Asc
    	Total     -> Total/Desc

    i.e. it takes a second click on a column to change to the opposite sort
    order, not always defaulting to 'Asc' when you change column.

commit 9c471d2cebb5e26bca64f968b6846279fb488d84
Author: Athanasius <gitlab@miggy.org>
Date:   Tue Jun 23 16:37:26 2020 +0100

    Now changing the pie chart depending on current sort column

commit c1f07a38700860a859647cd563f0133965d9068d
Author: Athanasius <gitlab@miggy.org>
Date:   Tue Jun 23 12:24:33 2020 +0100

    Remember prior 'softwares' sort and re-apply for new data

      This defaults on first load as per:

    	var softwaresSort = ...

commit fa560cadd754fd5a934b9c926befe4d40651aa61
Author: Athanasius <gitlab@miggy.org>
Date:   Tue Jun 23 08:42:44 2020 +0100

    Sane initial sorting, and some cleanup.

     * We can specify a sort column and order, no need for the 'reverse'
       hack, which is just going to confuse users and doesn't cause initial
       sorting anyway.
     * The softwaresTotal list can just be an Array, and then actually
       matches what we were doing with jsGridSoftwareByName[] anyway, so
       just use it.

commit 05cc80d09b8107b94313481d20fdf3a94bd71b7a
Author: Athanasius <gitlab@miggy.org>
Date:   Mon Jun 22 21:53:59 2020 +0100

    Documents the data, and why it's in different formats

commit b567a1b452a5685fe296c9d8a3eb7aaae35d291f
Author: Athanasius <gitlab@miggy.org>
Date:   Mon Jun 22 21:43:30 2020 +0100

    Remove the long-since defunct dataUploaders bits

commit 282dd9df4d5200a3cc59e21005275440e1550464
Author: Athanasius <gitlab@miggy.org>
Date:   Mon Jun 22 21:41:13 2020 +0100

    Moving closer to understanding the data.

      * We'll now use an id'd div to put in a jsGrid set of divs per:
      	1) The totals per software
    	2) Each software's versions counts

    Currently this is working to display the software name totals, and
    attempts to add the per-software version-counts tables, but treats the
    data incorrectly.

commit 5bcf4fb0a23315f2d3029f0f328a5c7a4a8bdf1a
Author: Athanasius <gitlab@miggy.org>
Date:   Mon Jun 22 21:40:24 2020 +0100

    div for software tables needs an id, not a class.

      We want to put one div inside it per overal softwares and then one per
    specific software.

commit 90e1a34d4cda8e960dcd13b1f7000af8904a614e
Author: Athanasius <gitlab@miggy.org>
Date:   Mon Jun 22 18:16:56 2020 +0100

    Main Software table and pie chart rendering correctly

     * Having to force the row line-height to what FF ends up with in the
       old code, which is ~37px, not the ~20px specified.
     * Applying data-name to the .square elements so as to then later set
       their background colour.  Can't do this as they're created as the
       data isn't yet in place to lookup the colour.
     * Removes the commented out old version of all that code, as it's now
       jsgrid-ised in that rowRenderer.

commit dfd2d09513fb4dafe1bc4ec0e3a9fb32ba7518c1
Author: Athanasius <gitlab@miggy.org>
Date:   Mon Jun 22 17:41:08 2020 +0100

    Fix rendering of custom rowRenderer Software rows

     * As jsGrid adds its own table there's no need to have our own, just
       use the .table-responsive div
     * Use a rowRenderer function based on the existing code to make the row
     * But that means needing to ensure the <td> styling manually, as jsgrid
       does one table for its header and another for the data.  It would
       apply the configured styling to botj, but with the custom rowRenderer
       that doesn't happen.

commit 70bb2e822e4e5d8253f308b4c862127126731637
Author: Athanasius <gitlab@miggy.org>
Date:   Mon Jun 22 16:55:20 2020 +0100

    Enable the Software main pie chart to actually render

      * The code to add the data points to it initially had been commented
        out.
      * That 'sort the data' also is the only thing populating
        softwaresTotal.

commit 61e1a17a1fba63cdcc7ce016b304c39670d90a11
Author: Athanasius <gitlab@miggy.org>
Date:   Mon Jun 22 16:04:51 2020 +0100

    CSS: Prevent jsGrid tables from showing un-necessary scrollbars

commit 1109bf57122428b6603fcea9836f0b95c36ee31b
Author: Athanasius <gitlab@miggy.org>
Date:   Mon Jun 22 15:49:26 2020 +0100

    Placeholder to implement clicking into drilldowns

      For now I want to just get the generation of drilldowns converted to
    jsGrid.  Then I'll look into hooking up clicking the softwareName
    causing switching to displaying its drilldown.

commit 87b78c98a0f59f10010c29abc3ee40f1ca3536e1
Author: Athanasius <gitlab@miggy.org>
Date:   Mon Jun 22 14:54:30 2020 +0100

    Numeric sorting now DESC first-click

commit 571a058a3fa3658ef4b7c4f3f40beab37585eb33
Author: Athanasius <gitlab@miggy.org>
Date:   Mon Jun 22 14:13:56 2020 +0100

    More progress.  Headings, comma-formatted numbers, widths...

      * Column added for the high-chart colours, not yet implemented fully.
        This will rely on implementing a custom jsGrid field.
      * comma-separated thousands formatting on the numbers.
      * Some width settings to match the pre-jsGrid layout.

commit a73f069d014c9ff5ea98158afe4ea993f2109a2c
Author: Athanasius <gitlab@miggy.org>
Date:   Mon Jun 22 12:52:12 2020 +0100

    Replace Software table with sortable jsgrid

    This is very rough and ready, but works:

      * Defaults to no sort
      * Sort will initially be ascending, we want descending
      * All the old styling is lost
      * Not yet handling click-through to per-softwareName version tables

commit 2afb5f435617ed4fec9771a0f5e95ceef5fdd671
Author: Athanasius <gitlab@miggy.org>
Date:   Mon Jun 22 12:51:52 2020 +0100

    Include jsgrid css and js
2020-06-25 14:00:55 +01:00
AnthorNet
7b4abf66a0 Add some monitoring to EDDN status 2018-12-14 21:36:18 +01:00
AnthorNet
b0a7d7ffb0 Remove uploaders from the nav also 2018-12-14 12:09:57 +01:00
AnthorNet
83d6942fe8 Comment Uploaders from status 2018-12-14 12:06:31 +01:00
AnthorNet
f13b4dfc30 Remove unneeded domain from nginx 2018-01-27 09:29:09 +01:00
AnthorNet
26f0d64745 Small fixes 2018-01-06 12:40:56 +01:00
AnthorNet
313120aa94 Implement tracking stats 2018-01-05 15:06:21 +01:00
AnthorNet
fa753ab84d Update old schemas to new schemas in main monitor front 2017-08-10 16:29:12 +02:00
AnthorNet
17bae4bfba Fix hits not INT 2017-08-10 16:18:37 +02:00
AnthorNet
91c1949a21 Fix old schema stats 2017-08-10 16:13:26 +02:00
AnthorNet
be0104d9a0 Make Nginx serves the canonical URI for schema 2017-07-03 14:14:49 +02:00
AnthorNet
1b192c0304 Update Gateway port 2017-06-29 15:14:00 +02:00
AnthorNet
e80f559931 Fix HTTPS upstream 2017-06-29 14:38:38 +02:00
AnthorNet
2cf8022b60 Add GATEWAY upstream from NGINX 2017-06-29 14:11:26 +02:00
AnthorNet
97ed7ad101 Add the new Gateway/Relay and make them act in HTTPS 2017-06-29 14:01:40 +02:00
AnthorNet
8bffbe91fa Make init.d scripts working with Debian 2017-06-29 12:20:39 +02:00
AnthorNet
5e841fb9c8 Switch monitor response to HTTPS 2017-06-29 12:04:03 +02:00