Page MenuHomeSoftware Heritage

grafana: clean pergamon resources
ClosedPublic

Authored by vsellier on Fri, Jan 14, 4:12 PM.

Details

Summary
  • Remove the grafana profile from the sysadmin role
  • Remove the unused grafana profile
  • Remove the vhost declaration and the relative properties

Related to T3817

Test Plan
  • grafana0
*** Running octocatalog-diff on host grafana0.internal.admin.swh.network
I, [2022-01-14T16:11:42.295333 #3158265]  INFO -- : Catalogs compiled for grafana0.internal.admin.swh.network
I, [2022-01-14T16:11:43.083689 #3158265]  INFO -- : Diffs computed for grafana0.internal.admin.swh.network
I, [2022-01-14T16:11:43.083767 #3158265]  INFO -- : No differences
*** End octocatalog-diff on grafana0.internal.admin.swh.network
  • rp1
*** Running octocatalog-diff on host rp1.internal.admin.swh.network
I, [2022-01-14T16:12:20.981226 #3160580]  INFO -- : Catalogs compiled for rp1.internal.admin.swh.network
I, [2022-01-14T16:12:22.131976 #3160580]  INFO -- : Diffs computed for rp1.internal.admin.swh.network
I, [2022-01-14T16:12:22.132072 #3160580]  INFO -- : No differences
*** End octocatalog-diff on rp1.internal.admin.swh.network
  • pergamon
I, [2022-01-14T16:04:16.589141 #3152440]  INFO -- : Diffs computed for pergamon.softwareheritage.org
diff origin/production/pergamon.softwareheritage.org current/pergamon.softwareheritage.org
*******************************************
- Anchor[apt_key 4E40DDF6D76E284A4A6780E48C8C34C524098CB6 present]
*******************************************
- Apache::Mod[proxy_wstunnel]
*******************************************
- Apache::Vhost[grafana.softwareheritage.org_non-ssl]
*******************************************
- Apache::Vhost[grafana.softwareheritage.org_ssl]
*******************************************
- Apt::Key[Add key: 4E40DDF6D76E284A4A6780E48C8C34C524098CB6 from Apt::Source grafana]
*******************************************
- Apt::Setting[list-grafana]
*******************************************
- Apt::Source[grafana]
*******************************************
- Apt_key[Add key: 4E40DDF6D76E284A4A6780E48C8C34C524098CB6 from Apt::Source grafana]
*******************************************
- Concat::Fragment[grafana.softwareheritage.org_non-ssl-access_log]
*******************************************
- Concat::Fragment[grafana.softwareheritage.org_non-ssl-apache-header]
*******************************************
- Concat::Fragment[grafana.softwareheritage.org_non-ssl-directories]
*******************************************
- Concat::Fragment[grafana.softwareheritage.org_non-ssl-docroot]
*******************************************
- Concat::Fragment[grafana.softwareheritage.org_non-ssl-file_footer]
*******************************************
- Concat::Fragment[grafana.softwareheritage.org_non-ssl-logging]
*******************************************
- Concat::Fragment[grafana.softwareheritage.org_non-ssl-redirect]
*******************************************
- Concat::Fragment[grafana.softwareheritage.org_non-ssl-serversignature]
*******************************************
- Concat::Fragment[grafana.softwareheritage.org_ssl-access_log]
*******************************************
- Concat::Fragment[grafana.softwareheritage.org_ssl-apache-header]
*******************************************
- Concat::Fragment[grafana.softwareheritage.org_ssl-directories]
*******************************************
- Concat::Fragment[grafana.softwareheritage.org_ssl-docroot]
*******************************************
- Concat::Fragment[grafana.softwareheritage.org_ssl-file_footer]
*******************************************
- Concat::Fragment[grafana.softwareheritage.org_ssl-header]
*******************************************
- Concat::Fragment[grafana.softwareheritage.org_ssl-logging]
*******************************************
- Concat::Fragment[grafana.softwareheritage.org_ssl-proxy]
*******************************************
- Concat::Fragment[grafana.softwareheritage.org_ssl-serversignature]
*******************************************
- Concat::Fragment[grafana.softwareheritage.org_ssl-ssl]
*******************************************
- Concat[25-grafana.softwareheritage.org_non-ssl.conf]
*******************************************
- Concat[25-grafana.softwareheritage.org_ssl.conf]
*******************************************
- Concat_file[25-grafana.softwareheritage.org_non-ssl.conf]
*******************************************
- Concat_file[25-grafana.softwareheritage.org_ssl.conf]
*******************************************
- Concat_fragment[grafana.softwareheritage.org_non-ssl-access_log]
*******************************************
- Concat_fragment[grafana.softwareheritage.org_non-ssl-apache-header]
*******************************************
- Concat_fragment[grafana.softwareheritage.org_non-ssl-directories]
*******************************************
- Concat_fragment[grafana.softwareheritage.org_non-ssl-docroot]
*******************************************
- Concat_fragment[grafana.softwareheritage.org_non-ssl-file_footer]
*******************************************
- Concat_fragment[grafana.softwareheritage.org_non-ssl-logging]
*******************************************
- Concat_fragment[grafana.softwareheritage.org_non-ssl-redirect]
*******************************************
- Concat_fragment[grafana.softwareheritage.org_non-ssl-serversignature]
*******************************************
- Concat_fragment[grafana.softwareheritage.org_ssl-access_log]
*******************************************
- Concat_fragment[grafana.softwareheritage.org_ssl-apache-header]
*******************************************
- Concat_fragment[grafana.softwareheritage.org_ssl-directories]
*******************************************
- Concat_fragment[grafana.softwareheritage.org_ssl-docroot]
*******************************************
- Concat_fragment[grafana.softwareheritage.org_ssl-file_footer]
*******************************************
- Concat_fragment[grafana.softwareheritage.org_ssl-header]
*******************************************
- Concat_fragment[grafana.softwareheritage.org_ssl-logging]
*******************************************
- Concat_fragment[grafana.softwareheritage.org_ssl-proxy]
*******************************************
- Concat_fragment[grafana.softwareheritage.org_ssl-serversignature]
*******************************************
- Concat_fragment[grafana.softwareheritage.org_ssl-ssl]
*******************************************
- File[/etc/apache2/mods-available/proxy_wstunnel.load]
*******************************************
- File[/etc/apache2/mods-enabled/proxy_wstunnel.load]
*******************************************
- File[/etc/apache2/sites-enabled/25-grafana.softwareheritage.org_non-ssl.conf]
*******************************************
- File[/etc/apache2/sites-enabled/25-grafana.softwareheritage.org_ssl.conf]
*******************************************
- File[/etc/apt/sources.list.d/grafana.list]
*******************************************
  File[/etc/bind/keys/local-update] =>
   parameters =>
     content =>
      @@ -2,4 +2,4 @@
       key local-update {
        algorithm hmac-sha256;
      - secret "7Br5DDlCPrLj5h153ogxJuSTTY5aBLnRbflagX8sqLNGzX3KkpOkj5FjnVV4b2kPLlEH8aHp2fL2dd4buwjhMg==";
      + secret "7Qtnmqnd1NDfJJjyqbL+h6Wu/gA3wSvYMbMXX5TJBfRQKSCHZJ7kAHMDQJMy4qVe9XVlBcUUI5HEqk/CtAGISA==";
       };
*******************************************
  File[/etc/bind/rndc.key] =>
   parameters =>
     content =>
      @@ -2,4 +2,4 @@
       key rndc-key {
        algorithm hmac-md5;
      - secret "NcLkTI8sH3WnyVl4XZLKTfqcFtcAo8mSmLiotj8gh5PDstEcbuQgPv7pbRK+zhC+mTi1sIpkPWeiaIBDYJNA9Q==";
      + secret "TlOyjDbNzrKzuRyBij3XDtZnEUGRUMlgvCR+fkeiiS5WAURx+9CTO4qH3EMFSqiVDhMf+0/dNWaVj6R/63oWeA==";
       };
*******************************************
- File[/etc/grafana/grafana.ini]
*******************************************
- File[/etc/ssl/certs/letsencrypt/grafana.softwareheritage.org/cert.pem]
*******************************************
- File[/etc/ssl/certs/letsencrypt/grafana.softwareheritage.org/chain.pem]
*******************************************
- File[/etc/ssl/certs/letsencrypt/grafana.softwareheritage.org/fullchain.pem]
*******************************************
- File[/etc/ssl/certs/letsencrypt/grafana.softwareheritage.org/privkey.pem]
*******************************************
- File[/etc/ssl/certs/letsencrypt/grafana.softwareheritage.org]
*******************************************
- File[/var/lib/grafana/plugins]
*******************************************
- Grafana_datasource[Prometheus (Pergamon)]
*******************************************
- Grafana_organization[Software Heritage]
*******************************************
- Package[grafana]
*******************************************
- Package[libfontconfig1]
*******************************************
- Postgresql::Server::Database[grafana]
*******************************************
- Postgresql::Server::Database_grant[GRANT grafana - ALL - grafana]
*******************************************
- Postgresql::Server::Db[grafana]
*******************************************
- Postgresql::Server::Grant[database:GRANT grafana - ALL - grafana]
*******************************************
- Postgresql::Server::Role[grafana]
*******************************************
- Postgresql_psql[ALTER ROLE "grafana" CONNECTION LIMIT -1]
*******************************************
- Postgresql_psql[ALTER ROLE "grafana" INHERIT]
*******************************************
- Postgresql_psql[ALTER ROLE "grafana" LOGIN]
*******************************************
- Postgresql_psql[ALTER ROLE "grafana" NOCREATEDB]
*******************************************
- Postgresql_psql[ALTER ROLE "grafana" NOCREATEROLE]
*******************************************
- Postgresql_psql[ALTER ROLE "grafana" NOREPLICATION]
*******************************************
- Postgresql_psql[ALTER ROLE "grafana" NOSUPERUSER]
*******************************************
- Postgresql_psql[ALTER ROLE grafana ENCRYPTED PASSWORD ****]
*******************************************
- Postgresql_psql[CREATE DATABASE "grafana"]
*******************************************
- Postgresql_psql[CREATE ROLE grafana ENCRYPTED PASSWORD ****]
*******************************************
- Postgresql_psql[REVOKE CONNECT ON DATABASE "grafana" FROM public]
*******************************************
- Postgresql_psql[UPDATE pg_database SET datistemplate = false WHERE datname = 'grafana']
*******************************************
- Postgresql_psql[grant:database:GRANT grafana - ALL - grafana]
*******************************************
- Profile::Letsencrypt::Certificate[grafana.softwareheritage.org]
*******************************************
- Service[grafana]
*******************************************
*** End octocatalog-diff on pergamon.softwareheritage.org

Diff Detail

Repository
rSPSITE puppet-swh-site
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

This revision is now accepted and ready to land.Fri, Jan 14, 4:14 PM

restore useful removed comment

This revision was automatically updated to reflect the committed changes.