Merge lp:~cprov/snappy-proposed-image-builder/logging into lp:snappy-proposed-image-builder

[Celso Providelo]

Adjust logstash service/solution name and hostname (plain socket gethostname()).

Adjust logstash service/solution name and hostname (plain socket gethostname()).

[Celso Providelo (cprov)]

Self-approving because I am evil!

review: Approve

[lp:~cprov/snappy-proposed-image-builder/logging]

7. By Celso Providelo on 2015-05-28

Adjust logstash service/solution name and hostname (plain socket gethostname()). [r=Celso Providelo]

=== modified file 'snappy_proposed_image_builder/constants.py'
--- snappy_proposed_image_builder/constants.py	2015-05-27 19:13:29 +0000
+++ snappy_proposed_image_builder/constants.py	2015-05-28 05:37:06 +0000
@@ -17,35 +17,17 @@
 
 """Constants for this service."""
 
+import socket
+
 API_VERSION = "v1"
 
 RETRY_COUNT = 3
 
-SOLUTION_NAME = "snappy-proposed-image-testing"
-
-SERVICE_NAME = "snappy-proposed-image-builder"
-
-
-def _get_hostname():
-    """Return sanitized contents of /etc/hostname.
-
-    It is necessary because current juju hostnames (juju-<env-name>-machine-#)
-    are too big due to our long environment names ('<spec_name>-<MD5>').
-    Linux (DNS for RFC1035, really) only supports labels up to 64 chars and
-    the fallback varies from tool to tool, `cloud-init` chokes on longer
-    names and sets 'ubuntu' (which is the value considered by socket.get*),
-    `hostnamectl` (systemd) would truncate the given data.
-
-    None of this is ideal to our applications, that's why we will operate
-    on the pristine /etc/hostname and remove the 'juju-' and '-machine' terms
-    added by juju.
-    """
-    with open('/etc/hostname') as fd:
-        hostname = fd.read()
-    return hostname.replace('juju-', '').replace('-machine', '').strip()
-
-
-HOSTNAME = _get_hostname()
+SOLUTION_NAME = "snappy-proposed"
+
+SERVICE_NAME = "image-builder"
+
+HOSTNAME = socket.gethostname()
 
 LOGGING_EXTRA = {
     'solution': SOLUTION_NAME,