Skip to content

Elephant-shed is now using pgadmin instead of omnidb, as omnidb isn't supported any more #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cd-jbo wants to merge 1 commit into
base: rel1_3
Choose a base branch
from
Open

Elephant-shed is now using pgadmin instead of omnidb, as omnidb isn't supported any more #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 5 additions & 6 deletions debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Architecture: all
Depends:
elephant-shed-cockpit,
elephant-shed-grafana,
elephant-shed-omnidb <!stretch>,
elephant-shed-pgadmin,
Copy link
Copy Markdown
Collaborator

@mbanck-cd mbanck-cd Sep 1, 2025

Choose a reason for hiding this comment

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

Last time, the package was called elephant-shed-pgadmin4, and this is how it is called upstream as well (pgadmin4-web), although they seem to be using "pgAdmin" and "pgAdmin 4" interchangeably nowadays.

But I still think we should go with pgadmin4 again.

elephant-shed-pgbackrest,
elephant-shed-pgbadger,
elephant-shed-portal,
Expand Down Expand Up @@ -67,16 +67,15 @@ Description: PostgreSQL dashboard -- PostgreSQL integration
.
This package provides the integration with PostgreSQL.

Package: elephant-shed-omnidb
Package: elephant-shed-pgadmin
Architecture: all
Build-Profiles: <!stretch>
Depends:
omnidb-server,
pgadmin4-web,
${misc:Depends},
Description: PostgreSQL dashboard -- OmniDB integration
Description: PostgreSQL dashboard -- Pgadmin integration
Copy link
Copy Markdown
Collaborator

@mbanck-cd mbanck-cd Sep 1, 2025

Choose a reason for hiding this comment

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

Official wording seems to be "pgAdmin", not "Pgadmin"

The Elephant Shed is a web-based PostgreSQL management front-end.
.
This meta package provides the integration with OmniDB.
This meta package provides the integration with Pgadmin.

Package: elephant-shed-pgbadger
Architecture: all
Expand Down
1 change: 0 additions & 1 deletion debian/elephant-shed-omnidb.install
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions debian/elephant-shed-omnidb.postinst
View file
Open in desktop

This file was deleted.

14 changes: 14 additions & 0 deletions debian/elephant-shed-pgadmin.postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/bin/sh

set -eu

case $1 in
configure)
echo "Configure pgadmin to use basicauth as authentication"
sed -i 's/^MASTER_PASSWORD_REQUIRED.*/MASTER_PASSWORD_REQUIRED = False/g' /usr/pgadmin4/web/config.py
Copy link
Copy Markdown
Collaborator

@mbanck-cd mbanck-cd Sep 1, 2025

Choose a reason for hiding this comment

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

So this lets the user login to pgadmin without having to type another password, right?

I think that is ok, but we probably need to check that this does not mean other people can just login from remote?

sed -i 's/^AUTHENTICATION_SOURCES.*/AUTHENTICATION_SOURCES = ['\''webserver'\'','\''internal'\'']/g' /usr/pgadmin4/web/config.py
export PGADMIN_SETUP_PASSWORD="pgadmin"; export PGADMIN_SETUP_EMAIL="admin@localhost.lan"; /usr/pgadmin4/bin/setup-web.sh --yes
;;
esac

#DEBHELPER#
2 changes: 1 addition & 1 deletion doc/chapter/installation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Elephant Shed consists of the following Debian packages and their dependencies:
* `elephant-shed-grafana`:
Preconfigured Prometheus datasource and dashboard that includes various system
and PostgreSQL metrics.
* `elephant-shed-omnidb`:
* `elephant-shed-Pgadmin`:
Configuration files for OmniDB.
* `elephant-shed-pgbackrest`:
Systemd service files and generators, helper scripts and preset configuration.
Expand Down
10 changes: 0 additions & 10 deletions omnidb/wsgi.py
View file
Open in desktop

This file was deleted.

16 changes: 1 addition & 15 deletions portal/elephant-shed.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,20 +80,6 @@

</Location>

<IfModule wsgi_module>
WSGIDaemonProcess omnidb user=omnidb group=omnidb
WSGIScriptAlias /omnidb /usr/share/elephant-shed/omnidb/wsgi.py process-group=omnidb
Alias /omnidb/static /usr/lib/python3/dist-packages/OmniDB_app/static
<Directory /usr/share/elephant-shed/omnidb>
<Files wsgi.py>
Require all granted
</Files>
</Directory>
<Directory /usr/lib/python3/dist-packages/OmniDB_app/static>
Require all granted
</Directory>
</IfModule>

<Location /powa>
ProxyPreserveHost On
ProxyPass http://127.0.0.1:8888/powa
Expand Down Expand Up @@ -126,7 +112,7 @@
<div class=\"esmenu\">\
<hr>\
<a target=\"_top\" href=\"../../../../../../../../\"><img title=\"Portal Home\" src=\"/image/button_home.png\"></a>\
<a target=\"_top\" href=\"../../../../../../../../omnidb/\"><img title=\"OmniDB\" src=\"/image/button_omnidb.png\"></a>\
<a target=\"_top\" href=\"../../../../../../../../pgadmin4/\"><img title=\"Pgadmin\" src=\"/image/button_pgadmin.png\"></a>\
<a target=\"_top\" href=\"../../../../../../../../grafana/\"><img title=\"Grafana\" src=\"/image/button_grafana.png\"></a>\
<a target=\"_top\" href=\"../../../../../../../../prometheus/\"><img title=\"Prometheus\" src=\"/image/button_prometheus.png\"></a>\
<a target=\"_top\" href=\"../../../../../../../../powa/server/\"><img title=\"PoWA\" src=\"/image/button_powa.png\"></a>\
Expand Down
4 changes: 2 additions & 2 deletions portal/template/portalmain.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
</a>
</div>
<div class="col component-link">
<a target="_top" href="/omnidb/">
<img class="main_icon" src="/image/button_omnidb.png" alt="OmniDB">
<a target="_top" href="/pgadmin4/">
<img class="main_icon" src="/image/button_pgadmin.png" alt="Pgadmin">
<p>DB Administration</p>
</a>
</div>
Expand Down
1 change: 0 additions & 1 deletion rpm/elephant-shed.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@ rm -rf %{buildroot}
# install in subpackages using the Debian files
for inst in debian/*.install; do
pkg=$(basename $inst .install)
[ "$pkg" = "elephant-shed-omnidb" ] && continue # not supported on RH yet
echo "### Reading $pkg files list from $inst ###"
while read file dir; do
case $file in
Expand Down
4 changes: 2 additions & 2 deletions vagrant/tasks/packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@

# elephant shed
# separate tasks, so we can see the progress better
- name: Install elephant-shed-omnidb
package: state=present name=elephant-shed-omnidb
- name: Install elephant-shed-pgadmin
package: state=present name=elephant-shed-pgadmin
when: 'ansible_distribution_release != "stretch"'
- name: Install elephant-shed-portal
package: state=present name=elephant-shed-portal
Expand Down