Compare commits
16 Commits
delete-bd
...
pr_workflo
Author | SHA1 | Date | |
---|---|---|---|
1bce8fbfce | |||
7279e5e043 | |||
e1ca847868 | |||
f06e62aea3 | |||
03072ec4c0 | |||
9848825516 | |||
f81ba23d8a | |||
17cd4cac60 | |||
77b10c9729 | |||
81fd29520d | |||
f635b7351e | |||
71b820ebf5 | |||
e3741c8b53 | |||
167f5cb883 | |||
746279eba1 | |||
6919069569 |
62
.gitea/workflows/create-weekly-analytics-stats.yaml
Normal file
62
.gitea/workflows/create-weekly-analytics-stats.yaml
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
name: Create Weekly Analytics Stats
|
||||||
|
|
||||||
|
on:
|
||||||
|
schedule:
|
||||||
|
# 03:00 UTC = 04:00 CET
|
||||||
|
- cron: "0 3 * * 1"
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
run-analytics:
|
||||||
|
runs-on: ubuntu
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout repository
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
token: ${{ secrets.PUSH_TOKEN }}
|
||||||
|
|
||||||
|
- name: Set up Python
|
||||||
|
uses: actions/setup-python@v5
|
||||||
|
with:
|
||||||
|
python-version: "3.12"
|
||||||
|
|
||||||
|
- name: Install dependencies
|
||||||
|
run: |
|
||||||
|
python -m pip install --upgrade pip
|
||||||
|
pip install requests otc-metadata
|
||||||
|
|
||||||
|
- name: Run analytics for eu_de
|
||||||
|
env:
|
||||||
|
UMAMI_USERNAME: ${{ secrets.UMAMI_USERNAME }}
|
||||||
|
UMAMI_PASSWORD: ${{ secrets.UMAMI_PASSWORD }}
|
||||||
|
run: |
|
||||||
|
python ./tools/collect_statistics.py \
|
||||||
|
--website-id "${{ secrets.UMAMI_WEBSITE_ID }}" \
|
||||||
|
--cloud-environment "eu_de" \
|
||||||
|
--environment "public" \
|
||||||
|
--limit "10"
|
||||||
|
|
||||||
|
- name: Run analytics for swiss
|
||||||
|
env:
|
||||||
|
UMAMI_USERNAME: ${{ secrets.UMAMI_USERNAME }}
|
||||||
|
UMAMI_PASSWORD: ${{ secrets.UMAMI_PASSWORD }}
|
||||||
|
run: |
|
||||||
|
python ./tools/collect_statistics.py \
|
||||||
|
--website-id "${{ secrets.UMAMI_WEBSITE_ID }}" \
|
||||||
|
--cloud-environment "swiss" \
|
||||||
|
--environment "public" \
|
||||||
|
--limit "10"
|
||||||
|
|
||||||
|
- name: Commit and push results
|
||||||
|
id: commit_step
|
||||||
|
run: |
|
||||||
|
git config --global user.name "gitea-actions[bot]"
|
||||||
|
git config --global user.email "actions@users.noreply.local"
|
||||||
|
git checkout -B analytics-update
|
||||||
|
git add analytics/
|
||||||
|
if git diff --cached --quiet; then
|
||||||
|
else
|
||||||
|
git commit -m "chore: update analytics data"
|
||||||
|
git push origin analytics-update --force
|
||||||
|
fi
|
18
.gitea/workflows/python-tox.yaml
Normal file
18
.gitea/workflows/python-tox.yaml
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
name: Run Tox Check
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
types: [opened, reopened, synchronize, edited]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
tox-py312:
|
||||||
|
runs-on: ubuntu
|
||||||
|
steps:
|
||||||
|
- uses: https://github.com/opentelekomcloud-infra/github-actions/.github/actions/tox-py-test@v1
|
||||||
|
|
||||||
|
tox-pep8:
|
||||||
|
runs-on: ubuntu
|
||||||
|
steps:
|
||||||
|
- uses: https://github.com/opentelekomcloud-infra/github-actions/.github/actions/tox-py-test@v1
|
||||||
|
with:
|
||||||
|
tox-env: pep8
|
32
.gitea/workflows/update_opensearch_filters.yaml
Normal file
32
.gitea/workflows/update_opensearch_filters.yaml
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
name: Updates Opensearch filters
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
types:
|
||||||
|
- closed
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
update-opensearch-filters:
|
||||||
|
if: github.event.pull_request.merged == true
|
||||||
|
runs-on: ubuntu
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout code
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Set up Python
|
||||||
|
uses: actions/setup-python@v5
|
||||||
|
with:
|
||||||
|
python-version: '3.12'
|
||||||
|
|
||||||
|
- name: Install dependencies and local package otc-metadata package
|
||||||
|
run: |
|
||||||
|
python -m pip install --upgrade pip
|
||||||
|
pip install . -r tools-requirements.txt
|
||||||
|
|
||||||
|
- name: Update swiss and eu_de Opensearch indizies
|
||||||
|
run: |
|
||||||
|
python tools/index_metadata.py --hosts ${{ secrets.OPENSEARCH_HOST1 }} --target-environment public --index search_index_de --cloud-environment eu_de --username ${{ secrets.OPENSEARCH_USER }} --password ${{ secrets.OPENSEARCH_PW }} --delete-index
|
||||||
|
python tools/index_metadata.py --hosts ${{ secrets.OPENSEARCH_HOST1 }} --target-environment public --index search_index_swiss --cloud-environment swiss --username ${{ secrets.OPENSEARCH_USER }} --password ${{ secrets.OPENSEARCH_PW }} --delete-index
|
12
analytics/public/eu_de.json
Normal file
12
analytics/public/eu_de.json
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
[
|
||||||
|
"evs",
|
||||||
|
"ims",
|
||||||
|
"ecs",
|
||||||
|
"cce",
|
||||||
|
"obs",
|
||||||
|
"rds",
|
||||||
|
"sfs",
|
||||||
|
"iam",
|
||||||
|
"config",
|
||||||
|
"elb"
|
||||||
|
]
|
12
analytics/public/swiss.json
Normal file
12
analytics/public/swiss.json
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
[
|
||||||
|
"evs",
|
||||||
|
"ims",
|
||||||
|
"ecs",
|
||||||
|
"cce",
|
||||||
|
"obs",
|
||||||
|
"rds",
|
||||||
|
"iam",
|
||||||
|
"elb",
|
||||||
|
"cbr",
|
||||||
|
"vpn"
|
||||||
|
]
|
@ -6,6 +6,7 @@ rst_location: api-ref/source
|
|||||||
service_type: bcc
|
service_type: bcc
|
||||||
title: API Reference
|
title: API Reference
|
||||||
type: api-ref
|
type: api-ref
|
||||||
|
disable_import: true
|
||||||
cloud_environments:
|
cloud_environments:
|
||||||
- name: eu_de
|
- name: eu_de
|
||||||
visibility: internal
|
visibility: internal
|
||||||
|
@ -6,6 +6,7 @@ rst_location: umn/source
|
|||||||
service_type: bcc
|
service_type: bcc
|
||||||
title: User Guide
|
title: User Guide
|
||||||
type: umn
|
type: umn
|
||||||
|
disable_import: true
|
||||||
cloud_environments:
|
cloud_environments:
|
||||||
- name: eu_de
|
- name: eu_de
|
||||||
visibility: internal
|
visibility: internal
|
||||||
|
@ -6,6 +6,7 @@ rst_location: umn/source
|
|||||||
service_type: sd
|
service_type: sd
|
||||||
title: User Guide
|
title: User Guide
|
||||||
type: umn
|
type: umn
|
||||||
|
disable_import: true
|
||||||
cloud_environments:
|
cloud_environments:
|
||||||
- name: swiss
|
- name: swiss
|
||||||
visibility: public
|
visibility: public
|
||||||
|
@ -453,3 +453,25 @@ class Services(object):
|
|||||||
res.sort(key=lambda x: x.get("name", "").lower())
|
res.sort(key=lambda x: x.get("name", "").lower())
|
||||||
|
|
||||||
return res
|
return res
|
||||||
|
|
||||||
|
def all_services_by_cloud_environment(self, cloud_environment, environments):
|
||||||
|
"""Retrieve all services filtered by cloud_environment
|
||||||
|
"""
|
||||||
|
res = []
|
||||||
|
for srv in self.all_services:
|
||||||
|
if environments and cloud_environment:
|
||||||
|
for srv_cloud_environment in srv["cloud_environments"]:
|
||||||
|
if srv_cloud_environment["name"] == cloud_environment:
|
||||||
|
for environment in environments:
|
||||||
|
if srv_cloud_environment["visibility"] == environment:
|
||||||
|
res.append(srv)
|
||||||
|
else:
|
||||||
|
continue
|
||||||
|
else:
|
||||||
|
raise Exception("No cloud_environment or environments "
|
||||||
|
"specified in function all_services_by_cloud_environment.")
|
||||||
|
|
||||||
|
# Sort services
|
||||||
|
res.sort(key=lambda x: x.get("service_title", "").lower())
|
||||||
|
|
||||||
|
return res
|
||||||
|
188
tools/collect_statistics.py
Executable file
188
tools/collect_statistics.py
Executable file
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user