Update spark job monitoring dashboard url (#132)

* Update spark job monitoring dashboard url

* Update test

Author: edingroot

service_configuration_lib/spark_config.py

@@ -1184,11 +1184,10 @@ def compute_requested_memory_overhead(spark_opts: Mapping[str, str], executor_me
 
 def get_grafana_url(spark_conf: Mapping[str, str]) -> str:
     return (
-        'https://grafana.yelpcorp.com/d/b8f79180-bea8-4001-9d4a-94978b5a20b6/spark-on-paasta-job-status?orgId=1&'
+        'http://y/spark-monitoring?'
         f"var-paasta_cluster={spark_conf['spark.executorEnv.PAASTA_CLUSTER']}&"
         f"var-service={spark_conf['spark.executorEnv.PAASTA_SERVICE']}&"
-        f"var-instance={spark_conf['spark.executorEnv.PAASTA_INSTANCE']}&"
-        'var-pod_name_spark=All'
+        f"var-instance={spark_conf['spark.executorEnv.PAASTA_INSTANCE']}"
     )
 
 

setup.py

@@ -17,7 +17,7 @@
 
 setup(
     name='service-configuration-lib',
-    version='2.18.8',
+    version='2.18.9',
     provides=['service_configuration_lib'],
     description='Start, stop, and inspect Yelp SOA services',
     url='https://github.com/Yelp/service_configuration_lib',

tests/spark_config_test.py

@@ -1501,11 +1501,10 @@ def test_get_grafana_url():
         'spark.executorEnv.PAASTA_INSTANCE': 'test-instance',
     }
     assert spark_config.get_grafana_url(spark_conf) == (
-        'https://grafana.yelpcorp.com/d/b8f79180-bea8-4001-9d4a-94978b5a20b6/spark-on-paasta-job-status?orgId=1&'
+        'http://y/spark-monitoring?'
         'var-paasta_cluster=test-cluster&'
         'var-service=test-service&'
-        'var-instance=test-instance&'
-        'var-pod_name_spark=All'
+        'var-instance=test-instance'
     )