diff --git a/metrics/access/aggregate.php b/metrics/access/aggregate.php index 05477a48..63d8f582 100755 --- a/metrics/access/aggregate.php +++ b/metrics/access/aggregate.php @@ -11,7 +11,7 @@ const LANGLEY = 'http://langley.suse.de/pub/pontifex%s-opensuse.suse.de'; const VHOST = 'download.opensuse.org'; const FILENAME = 'download.opensuse.org-%s-access_log.xz'; const IPV6_PREFIX = 'ipv6.'; -const PRODUCT_PATTERN = '/^(10\.[2-3]|11\.[0-4]|12\.[1-3]|13\.[1-2]|42\.[1-3]|15\.[0-3]|tumbleweed)$/'; +const PRODUCT_PATTERN = '/^(10\.[2-3]|11\.[0-4]|12\.[1-3]|13\.[1-2]|42\.[1-3]|15\.[0-4]|tumbleweed)$/'; $begin = new DateTime(); // Skip the current day since the logs are incomplete and not compressed yet. diff --git a/metrics/annotation/openSUSE:Leap:15.3.yaml b/metrics/annotation/openSUSE:Leap:15.3.yaml index d315f668..57d3f72e 100644 --- a/metrics/annotation/openSUSE:Leap:15.3.yaml +++ b/metrics/annotation/openSUSE:Leap:15.3.yaml @@ -1,4 +1,4 @@ 2021-02-17: "Beta phase" 2021-06-02: "RC phase (package freeze)" -2020-06-30: "Final submission deadline" +2021-06-30: "Final submission deadline" 2021-07-07: "Final release" diff --git a/metrics/annotation/openSUSE:Leap:15.4.yaml b/metrics/annotation/openSUSE:Leap:15.4.yaml new file mode 100644 index 00000000..0ef881ef --- /dev/null +++ b/metrics/annotation/openSUSE:Leap:15.4.yaml @@ -0,0 +1,4 @@ +2022-03-02: "Beta phase" +2022-04-20: "RC phase (package freeze)" +2022-05-11: "Final submission deadline" +2022-06-08: "Final release" diff --git a/metrics/grafana/access.json b/metrics/grafana/access.json index c5743eec..1ebaf7f2 100644 --- a/metrics/grafana/access.json +++ b/metrics/grafana/access.json @@ -47,6 +47,22 @@ "type": "datasource", "pluginId": "influxdb", "pluginName": "InfluxDB" + }, + { + "name": "openSUSE:Leap:15.3", + "label": "openSUSE:Leap:15.3", + "description": "", + "type": "datasource", + "pluginId": "influxdb", + "pluginName": "InfluxDB" + }, + { + "name": "openSUSE:Leap:15.4", + "label": "openSUSE:Leap:15.4", + "description": "", + "type": "datasource", + "pluginId": "influxdb", + "pluginName": "InfluxDB" } ], "__requires": [ diff --git a/metrics/grafana/provisioning/datasources.yaml b/metrics/grafana/provisioning/datasources.yaml index 936920dd..2c74381d 100644 --- a/metrics/grafana/provisioning/datasources.yaml +++ b/metrics/grafana/provisioning/datasources.yaml @@ -7,6 +7,18 @@ datasources: access: proxy database: openSUSE:Factory +- name: openSUSE:Leap:15.4 + type: influxdb + url: http://localhost:8086 + access: proxy + database: openSUSE:Leap:15.4 + +- name: openSUSE:Leap:15.3 + type: influxdb + url: http://localhost:8086 + access: proxy + database: openSUSE:Leap:15.3 + - name: openSUSE:Leap:15.2 type: influxdb url: http://localhost:8086