diff --git a/docs/clmc-service.md b/docs/clmc-service.md
index e99b485f9ff415458c58441eda0152f516815810..e1b21a49f155c68929a5f95766c413fa0bea8d0f 100644
--- a/docs/clmc-service.md
+++ b/docs/clmc-service.md
@@ -346,6 +346,10 @@ configuration files of the service can be found in the **src/service** folder.
         }
         ```
 
+* Generating network measurements
+
+    To generate network measurements, which are then used to create the network topology in the Neo4j graph, refer to
+    the src/service/clmcservice/generate_network_measurements.py script. An example configuration file is src/service/resources/GraphAPI/network_config.json
 
 ## CRUD API for service function endpoint configurations
 
diff --git a/scripts/clmc-service/install-tick-stack.sh b/scripts/clmc-service/install-tick-stack.sh
index 0f60ae39c6267f2f2873c987f0e11c67dcb182ac..2ca0c5464429309afbad3f6ea429dfe6e5cdeb4a 100755
--- a/scripts/clmc-service/install-tick-stack.sh
+++ b/scripts/clmc-service/install-tick-stack.sh
@@ -45,9 +45,13 @@ if [ $? == 1 ]; then
 fi
 dpkg -i chronograf_${CHRONOGRAF_VERSION}_amd64.deb
 
+# configure Chronograf systemd service file
+sed -i 's/^ExecStart.*/ExecStart=\/usr\/bin\/chronograf --basepath=\/chronograf --prefix-routes $CHRONOGRAF_OPTS/' /lib/systemd/system/chronograf.service
+systemctl daemon-reload
+
 systemctl start influxdb
 systemctl start kapacitor
-systemctl start chronograf
+systemctl restart chronograf
 
 # wait for kapacitor to start
 while ! nc -z localhost 9092
diff --git a/scripts/clmc-service/nginx.conf b/scripts/clmc-service/nginx.conf
index 35dd1ff22ff6eca58cd745d9456a34f2fd7d4fb5..3cb407fac3096d2683aa50f5a1b60f32ccaa8342 100644
--- a/scripts/clmc-service/nginx.conf
+++ b/scripts/clmc-service/nginx.conf
@@ -55,5 +55,13 @@ http {
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Host $server_name;
         }
+        location /chronograf {
+            proxy_pass http://127.0.0.1:8888; # No trailing slash - chronograf is configured to include /chronograf in its routes
+            proxy_redirect off;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Host $server_name;
+        }
     }
 }
\ No newline at end of file