diff --git a/cloud_benchmarking/script_to_follow_GCloud b/cloud_benchmarking/script_to_follow_GCloud index c8d700b..76f13f9 100644 --- a/cloud_benchmarking/script_to_follow_GCloud +++ b/cloud_benchmarking/script_to_follow_GCloud @@ -1,4 +1,4 @@ -# ON YOUR MACHINE (ON FERMICLOUD 241): +# ON YOUR MACHINE (ON ***REMOVED***): echo "Enter instance name: (E.g: n1_test)" read inst_name @@ -14,7 +14,7 @@ gcloud compute scp oldbenchmark.tar run_DB12.sh ~/GoogleCloudBenchmarking/full_b bash full_benchmark_for_GCloud.sh ###################################################################################################################### -# ON YOUR MACHINE (FERMICLOUD 241): +# ON YOUR MACHINE (***REMOVED***): # # save results in a corresponding folder on this machine # ONLY DO THIS AFTER A FEW HOURS!!!! diff --git a/de_monitoring/digest/logstash.conf.digest b/de_monitoring/digest/logstash.conf.digest index 69e96e6..c8b7c00 100644 --- a/de_monitoring/digest/logstash.conf.digest +++ b/de_monitoring/digest/logstash.conf.digest @@ -1,7 +1,7 @@ # This conf file is to take raw dCache billing data from Kafka, clean it up, and write it to a digest topic in Kafka input { kafka { - bootstrap_servers => "lssrv02.fnal.gov:9092" + bootstrap_servers => ***REMOVED*** topics => ["test.hepcloud.de"] auto_offset_reset => "earliest" decorate_events => true @@ -24,7 +24,7 @@ filter { output { # stdout {codec=>"rubydebug"} kafka { - bootstrap_servers => "lssrv02.fnal.gov:9092" + bootstrap_servers => ***REMOVED*** topic_id => "digest.test.hepcloud.de" codec => "json" } diff --git a/de_monitoring/filebeat/filebeat.yml b/de_monitoring/filebeat/filebeat.yml index 6d5031b..47991c8 100644 --- a/de_monitoring/filebeat/filebeat.yml +++ b/de_monitoring/filebeat/filebeat.yml @@ -205,7 +205,7 @@ setup.kibana: #----------------------------- Kafka output -------------------------------- output.kafka: # initial brokers for reading cluster metadata - hosts: ["lssrv02.fnal.gov:9092", ] + hosts: [***REMOVED***, ] # message topic selection + partitioning # topic: '%{[fields.log_topic]}' diff --git a/de_monitoring/store/logstash.conf b/de_monitoring/store/logstash.conf index c1399c7..cadaa77 100644 --- a/de_monitoring/store/logstash.conf +++ b/de_monitoring/store/logstash.conf @@ -1,6 +1,6 @@ input { kafka { - bootstrap_servers => "lssrv02:9092" + bootstrap_servers => ***REMOVED*** topics => [ "test.hepcloud.de" ] auto_offset_reset => "earliest" # After testing, change to latest decorate_events => true diff --git a/integration_test/condor/condor_mapfile b/integration_test/condor/condor_mapfile index 84326b4..e6a619e 100644 --- a/integration_test/condor/condor_mapfile +++ b/integration_test/condor/condor_mapfile @@ -1,5 +1,5 @@ GSI "^/DC=org/DC=incommon/C=US/ST=Illinois/O=Fermi Research Alliance/OU=Fermilab/CN=@FERMICLOUDNODE@\.fnal\.gov$" decisionengine_service GSI "^/DC=org/DC=cilogon/C=US/O=Fermi National Accelerator Laboratory/OU=People/CN=@First Last Name@/CN=UID:@username@" decisionengine_service -GSI "^/DC=org/DC=incommon/C=US/ST=Illinois/O=Fermi Research Alliance/OU=Fermilab/CN=fermicloud576\.fnal\.gov$" gfactory +GSI "^/DC=org/DC=incommon/C=US/ST=Illinois/O=Fermi Research Alliance/OU=Fermilab/CN=***REMOVED***$" gfactory GSI (.*) anonymous FS (.*) \1 diff --git a/integration_test/decisionengine/config.d/job_classification.libsonnet b/integration_test/decisionengine/config.d/job_classification.libsonnet index 7d0803f..43d4861 100644 --- a/integration_test/decisionengine/config.d/job_classification.libsonnet +++ b/integration_test/decisionengine/config.d/job_classification.libsonnet @@ -4,9 +4,9 @@ module: "decisionengine_modules.htcondor.sources.job_q", parameters: { condor_config: "/etc/condor/condor_config", - collector_host: "@FERMICLOUDNODE@.fnal.gov", + collector_host: ***REMOVED***, schedds: [ - "@FERMICLOUDNODE@.fnal.gov" + ***REMOVED*** ], constraint: "True", classad_attrs: [ @@ -163,7 +163,7 @@ "TotalSlotCpus":0, "GLIDEIN_CredentialIdentifier":'' }, - collector_host: "fermicloud576.fnal.gov", + collector_host: ***REMOVED***, condor_config: "/etc/condor/condor_config" }, max_attempts: 100, @@ -194,7 +194,7 @@ name: "JobClusteringPublisher", parameters: { publish_to_graphite: true, - graphite_host: "fifemondata.fnal.gov", + graphite_host: ***REMOVED***, graphite_port: 2004, graphite_context: "hepcloud.de.@FERMICLOUDNODE@.glideinwms", output_file: "/etc/decisionengine/modules.data/job_cluster_totals.csv", diff --git a/integration_test/decisionengine/config.d/resource_request.jsonnet b/integration_test/decisionengine/config.d/resource_request.jsonnet index 0c7dc17..6bdae50 100644 --- a/integration_test/decisionengine/config.d/resource_request.jsonnet +++ b/integration_test/decisionengine/config.d/resource_request.jsonnet @@ -11,7 +11,7 @@ local channels = [ condor_config: "/etc/condor/condor_config", factories: [ { - collector_host: "fermicloud576.fnal.gov", + collector_host: ***REMOVED***, classad_attrs: [] }, ], @@ -24,7 +24,7 @@ local channels = [ condor_config: "/etc/condor/condor_config", factories: [ { - collector_host: "fermicloud576.fnal.gov", + collector_host: ***REMOVED***, classad_attrs: [], correction_map: { "GLIDEIN_Resource_Slots":'', diff --git a/integration_test/decisionengine/glideinwms.libsonnet b/integration_test/decisionengine/glideinwms.libsonnet index 10d1ff0..7aaf365 100644 --- a/integration_test/decisionengine/glideinwms.libsonnet +++ b/integration_test/decisionengine/glideinwms.libsonnet @@ -68,11 +68,11 @@ "match_attrs": {}, "collectors": [ { - "DN": "/DC=org/DC=incommon/C=US/ST=Illinois/O=Fermi Research Alliance/OU=Fermilab/CN=fermicloud576.fnal.gov", + "DN": ***REMOVED***, "comment": "Test Factory", - "factory_identity": "gfactory@fermicloud576.fnal.gov", - "my_identity": "decisionengine_service@fermicloud576.fnal.gov", - "node": "fermicloud576.fnal.gov" + "factory_identity": ***REMOVED***, + "my_identity": ***REMOVED***, + "node": ***REMOVED*** } ] }, @@ -82,8 +82,8 @@ "match_attrs": {}, "schedds": [ { - "DN": "/DC=org/DC=incommon/C=US/ST=Illinois/O=Fermi Research Alliance/OU=Fermilab/CN=@FERMICLOUDNODE@.fnal.gov", - "fullname": "@FERMICLOUDNODE@.fnal.gov" + "DN": ***REMOVED***, + "fullname": ***REMOVED*** } ] } @@ -103,8 +103,8 @@ "security": { "classad_proxy": "/var/de/fe_proxy", - "comment": "Test DE at @FERMICLOUDNODE@.fnal.gov", - "proxy_DN": "/DC=org/DC=incommon/C=US/ST=Illinois/O=Fermi Research Alliance/OU=Fermilab/CN=@FERMICLOUDNODE@.fnal.gov", + "comment": ***REMOVED***, + "proxy_DN": ***REMOVED***, "proxy_selection_plugin": "ProxyAll", "security_name": "decisionengine_service", "sym_key": "aes_256_cbc", @@ -121,7 +121,7 @@ "stage": { "base_dir": "/var/lib/gwms-frontend/web-area/stage", "use_symlink": "True", - "web_base_url": "http://@FERMICLOUDNODE@.fnal.gov/vofrontend/stage" + "web_base_url": ***REMOVED*** }, "work": { diff --git a/site_specific/Theta/customize.sh b/site_specific/Theta/customize.sh index 3c24e27..5192f36 100755 --- a/site_specific/Theta/customize.sh +++ b/site_specific/Theta/customize.sh @@ -11,7 +11,7 @@ # awk --file `dirname $0`/customhelps.awk --source '{ -setoption("cache_peer", "theta-proxy.tmi.alcf.anl.gov parent 3128 0 no-query") +setoption("cache_peer", "***REMOVED*** parent 3128 0 no-query") setoption("acl NET_LOCAL src", "127.0.0.1/32") setoption("cache_mem", "128 MB") setoptionparameter("cache_dir", 3, "10000") diff --git a/site_specific/Theta/default.local b/site_specific/Theta/default.local index 9bfc2a0..04a9f9d 100644 --- a/site_specific/Theta/default.local +++ b/site_specific/Theta/default.local @@ -1,4 +1,4 @@ -CVMFS_HTTP_PROXY="http://theta-proxy.tmi.alcf.anl.gov:3128" +CVMFS_HTTP_PROXY="http://***REMOVED***:3128" CVMFS_CACHE_BASE=/local/scratch/uscms/cvmfs-cache CVMFS_QUOTA_LIMIT=10000 CMS_LOCAL_SITE=T3_US_ANL