Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Spark SignalFx dashboard URLs #143

Merged
merged 1 commit into from
Mar 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions service_configuration_lib/spark_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -1209,18 +1209,6 @@ def get_grafana_url(spark_conf: Mapping[str, str]) -> str:
)


def get_signalfx_url(spark_conf: Mapping[str, str]) -> str:
return (
'https://app.signalfx.com/#/dashboard/FOjL2yRAcAA?density=4'
'&variables%5B%5D=Instance%3Dinstance_name:'
'&variables%5B%5D=Service%3Dservice_name:%5B%22spark%22%5D'
f"&variables%5B%5D=PaaSTA%20Cluster%3Dpaasta_cluster:{spark_conf['spark.executorEnv.PAASTA_CLUSTER']}"
f"&variables%5B%5D=PaaSTA%20Service%3Dpaasta_service:{spark_conf['spark.executorEnv.PAASTA_SERVICE']}"
f"&variables%5B%5D=PaaSTA%20Instance%3Dpaasta_instance:{spark_conf['spark.executorEnv.PAASTA_INSTANCE']}"
'&startTime=-1h&endTime=Now'
)


def get_resources_requested(spark_opts: Mapping[str, str]) -> Mapping[str, int]:
num_executors = (
# spark on k8s directly configure num instances
Expand Down
17 changes: 0 additions & 17 deletions tests/spark_config_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -1537,23 +1537,6 @@ def test_get_grafana_url():
)


def test_get_signalfx_url():
spark_conf = {
'spark.executorEnv.PAASTA_CLUSTER': 'test-cluster',
'spark.executorEnv.PAASTA_SERVICE': 'test-service',
'spark.executorEnv.PAASTA_INSTANCE': 'test-instance',
}
assert spark_config.get_signalfx_url(spark_conf) == (
'https://app.signalfx.com/#/dashboard/FOjL2yRAcAA?density=4'
'&variables%5B%5D=Instance%3Dinstance_name:'
'&variables%5B%5D=Service%3Dservice_name:%5B%22spark%22%5D'
'&variables%5B%5D=PaaSTA%20Cluster%3Dpaasta_cluster:test-cluster'
'&variables%5B%5D=PaaSTA%20Service%3Dpaasta_service:test-service'
'&variables%5B%5D=PaaSTA%20Instance%3Dpaasta_instance:test-instance'
'&startTime=-1h&endTime=Now'
)


@pytest.mark.parametrize(
'spark_opts,expected_output', [
# mesos ( 2 instances, not configure memory overhead, default: 384m )
Expand Down
Loading