Skip to content
Open
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c71eba6
[deps] Migrate from django-celery-email to django-post-office #477
Adityashandilya555 Oct 4, 2025
35d7e8e
Merge branch 'master' into issues/477-migrate-django-celery-email
Adityashandilya555 Oct 4, 2025
3077748
Merge branch 'master' into issues/477-migrate-django-celery-email
Adityashandilya555 Oct 5, 2025
68ee23e
Merge branch 'master' into issues/477-migrate-django-celery-email
Adityashandilya555 Oct 10, 2025
01e4e23
[deps] Migrate from django-celery-email to django-celery-email-reboot…
Adityashandilya555 Oct 11, 2025
6802ce1
[enhancement] Use dashboard domain for monitoring chart loading
Adityashandilya555 Oct 26, 2025
39b7131
Merge branch 'master' into fix/chart-loading-use-dashboard-domain
Adityashandilya555 Oct 26, 2025
ef44967
Merge branch 'master' into fix/chart-loading-use-dashboard-domain
Adityashandilya555 Oct 27, 2025
5ec703d
Merge branch 'master' into fix/chart-loading-use-dashboard-domain
Adityashandilya555 Nov 5, 2025
e2546cb
Merge branch 'master' into fix/chart-loading-use-dashboard-domain
Adityashandilya555 Dec 7, 2025
5734605
[qa] Fix RST formatting
Adityashandilya555 Dec 9, 2025
8cb14af
[deps] Pin sphinx<8.0.0 for docstrfmt compatibility
Adityashandilya555 Dec 9, 2025
ee0055e
Merge branch 'master' into fix/chart-loading-use-dashboard-domain
nemesifier Dec 19, 2025
a21271c
Merge branch 'master' into fix/chart-loading-use-dashboard-domain
Adityashandilya555 Dec 24, 2025
05c9296
Merge branch 'master' into fix/chart-loading-use-dashboard-domain
Adityashandilya555 Jan 13, 2026
4105107
[fix] Load monitoring charts from dashboard domain #526
Adityashandilya555 Jan 13, 2026
f54a5c1
Merge branch 'master' into fix/chart-loading-use-dashboard-domain
Adityashandilya555 Jan 27, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion images/openwisp_dashboard/module_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,14 @@
else f":{HTTP_PORT}"
)
API_BASEURL = f'{HTTP_SCHEME}://{os.environ["API_DOMAIN"]}{HTTP_PORT}'
DASHBOARD_BASEURL = f'{HTTP_SCHEME}://{os.environ["DASHBOARD_DOMAIN"]}{HTTP_PORT}'

OPENWISP_NETWORK_TOPOLOGY_API_URLCONF = "openwisp_network_topology.urls"
OPENWISP_MONITORING_API_URLCONF = "openwisp_monitoring.urls"
OPENWISP_RADIUS_API_URLCONF = "openwisp_radius.urls"
OPENWISP_NETWORK_TOPOLOGY_API_BASEURL = API_BASEURL
OPENWISP_NOTIFICATIONS_HOST = API_BASEURL
OPENWISP_CONTROLLER_API_HOST = API_BASEURL
OPENWISP_MONITORING_API_BASEURL = API_BASEURL
OPENWISP_MONITORING_API_BASEURL = DASHBOARD_BASEURL
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would removing OPENWISP_MONITORING_API_BASEURL completely work?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, removing OPENWISP_MONITORING_API_BASEURL completely should work. I checked the openwisp-monitoring source and the default value is None, which means the charts will use relative URLs and load from the current domain (the dashboard domain).

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's do that then and simplify this. This way we don't need to define DASHBOARD_BASEURL.
Keep it simple. Please do manual testing to ensure the approach work and record a video showing the result.

OPENWISP_FIRMWARE_API_BASEURL = API_BASEURL
OPENWISP_RADIUS_API_BASEURL = API_BASEURL
1 change: 1 addition & 0 deletions requirements-test.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
docker>=7.1.0,<7.2.0
openwisp-utils[qa,selenium]~=1.2.0
sphinx<8.0.0
Comment thread
Adityashandilya555 marked this conversation as resolved.
Outdated