Merge pull request #1136 from grogsaxle/develop

SSL_CERT_DIR setting for service

hubblestack/grains/osqueryinfo.py

@@ -42,7 +42,7 @@ def osquery_host_state():
                 deets["auditd_present"] = True
                 deets[grain_key] = "inactive"
         except subprocess.CalledProcessError:
-            log.info("%s doesn't seem to be running according to systemd")
+            log.info("%s doesn't seem to be running according to systemd", systemd_name)
         except Exception as e:
             log.info("Unknown exception checking systemctl for %s status: %s", systemd_name, e)
 

pkg/flatcar.arm64/entrypoint.sh

@@ -131,7 +131,7 @@ mkdir -p /etc/systemd/system
 mkdir -p /etc/profile.d
 mkdir -p /etc/hubble/hubble.d
 
-cp -v /hubble_build/pkg/hubble.service /etc/hubble/hubble-example.service
+cp -v /hubble_build/pkg/hubble_flatcar.service /etc/hubble/hubble-example.service
 cp -v /hubble_build/conf/hubble-profile.sh /etc/profile.d/
 cp -v /hubble_build/conf/hubble-d-conf     /etc/hubble/hubble.d
 

pkg/hubble_flatcar.service

@@ -0,0 +1,16 @@
+[Unit]
+Description=Hubblestack
+Requires=network-online.target
+After=network-online.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/hubble.pid
+ExecStart=/opt/hubble/hubble -d
+Restart=always
+RestartSec=300
+MemoryAccounting=true
+Environment=SSL_CERT_DIR=/usr/share/ca-certificates/
+
+[Install]
+WantedBy=multi-user.target