test/plugin/constants.rb in fluent-plugin-google-cloud-0.7.30 vs test/plugin/constants.rb in fluent-plugin-google-cloud-0.8.0

- old
+ new

@@ -50,12 +50,10 @@ include Fluent::GoogleCloudOutput::InternalConstants # Generic attributes. HOSTNAME = Socket.gethostname CUSTOM_LOGGING_API_URL = 'http://localhost:52000'.freeze - CUSTOM_METADATA_AGENT_URL = 'http://localhost:12345'.freeze - METADATA_AGENT_URL_FROM_ENV = 'http://localhost:54321'.freeze # TODO(qingling128) Separate constants into different submodules. # Attributes used for the GCE metadata service. PROJECT_ID = 'test-project-id'.freeze ZONE = 'us-central1-b'.freeze @@ -131,22 +129,10 @@ "projects/#{PROJECT_ID}/traces/#{INVALID_LONG_STACKDRIVER_TRACE_ID}".freeze INVALID_TRACE_WITH_NON_HEX_TRACE_ID = \ "projects/#{PROJECT_ID}/" \ "traces/#{INVALID_NON_HEX_STACKDRIVER_TRACE_ID}".freeze - # Docker Container labels. - DOCKER_CONTAINER_ID = - '0d0f03ff8d3c42688692536d1af77a28cd135c0a5c531f25a31'.freeze - DOCKER_CONTAINER_NAME = 'happy_hippo'.freeze - DOCKER_CONTAINER_STREAM_STDOUT = 'stdout'.freeze - DOCKER_CONTAINER_STREAM_STDERR = 'stderr'.freeze - # Timestamp for 1234567890 seconds and 987654321 nanoseconds since epoch. - DOCKER_CONTAINER_TIMESTAMP = '2009-02-13T23:31:30.987654321Z'.freeze - DOCKER_CONTAINER_SECONDS_EPOCH = 1_234_567_890 - DOCKER_CONTAINER_NANOS = 987_654_321 - DOCKER_CONTAINER_LOCAL_RESOURCE_ID_PREFIX = 'container'.freeze - # New K8s resource constants. K8S_LOCATION = 'us-central1-b'.freeze K8S_LOCATION2 = 'us-central1-c'.freeze K8S_CLUSTER_NAME = 'cluster-1'.freeze K8S_NAMESPACE_NAME = 'kube-system'.freeze @@ -236,22 +222,14 @@ CUSTOM_LOGGING_API_URL_CONFIG = %( logging_api_url #{CUSTOM_LOGGING_API_URL} ).freeze - CUSTOM_METADATA_AGENT_URL_CONFIG = %( - metadata_agent_url #{CUSTOM_METADATA_AGENT_URL} - ).freeze - DETECT_JSON_CONFIG = %( detect_json true ).freeze - PARTIAL_SUCCESS_DISABLED_CONFIG = %( - partial_success false - ).freeze - # rubocop:disable Metrics/LineLength PRIVATE_KEY_CONFIG = %( auth_method private_key private_key_email 271661262351-ft99kc9kjro9rrihq3k2n3s2inbplu0q@developer.gserviceaccount.com private_key_path test/plugin/data/c31e573fd7f62ed495c9ca3821a5a85cb036dee1-privatekey.p12 @@ -282,32 +260,18 @@ ENABLE_OPENCENSUS_CONFIG = %( enable_monitoring true monitoring_type opencensus ).freeze - ENABLE_METADATA_AGENT_CONFIG = %( - enable_metadata_agent true - ).freeze - - DISABLE_METADATA_AGENT_CONFIG = %( - enable_metadata_agent false - ).freeze - ENABLE_AUTOFORMAT_STACKDRIVER_TRACE_CONFIG = %( autoformat_stackdriver_trace true ).freeze DISABLE_AUTOFORMAT_STACKDRIVER_TRACE_CONFIG = %( autoformat_stackdriver_trace false ).freeze - DOCKER_CONTAINER_CONFIG = %( - enable_metadata_agent true - label_map { "source": "#{DOCKER_CONSTANTS[:service]}/stream" } - detect_json true - ).freeze - CUSTOM_METADATA_CONFIG = %( project_id #{CUSTOM_PROJECT_ID} zone #{CUSTOM_ZONE} vm_id #{CUSTOM_VM_ID} vm_name #{CUSTOM_HOSTNAME} @@ -326,18 +290,16 @@ zone #{CUSTOM_ZONE} ).freeze CONFIG_MISSING_METADATA_ALL = %( ).freeze - CUSTOM_K8S_ENABLE_METADATA_AGENT_CONFIG = %( - enable_metadata_agent true + CUSTOM_K8S_CONFIG = %( k8s_cluster_name #{CUSTOM_K8S_CLUSTER_NAME} k8s_cluster_location #{CUSTOM_K8S_LOCATION} ).freeze - EMPTY_K8S_ENABLE_METADATA_AGENT_CONFIG = %( - enable_metadata_agent true + EMPTY_K8S_CONFIG = %( k8s_cluster_name "" k8s_cluster_location "" ).freeze CONFIG_EC2_PROJECT_ID = %( @@ -478,26 +440,23 @@ adjust_invalid_timestamps false autoformat_stackdriver_trace false coerce_to_utf8 false detect_json true detect_subservice false - enable_metadata_agent true enable_monitoring true http_request_key test_http_request_key insert_id_key test_insert_id_key k8s_cluster_location test-k8s-cluster-location k8s_cluster_name test-k8s-cluster-name kubernetes_tag_regexp .*test-regexp.* label_map { "label_map_key": "label_map_value" } labels_key test_labels_key labels { "labels_key": "labels_value" } logging_api_url http://localhost:52000 - metadata_agent_url http://localhost:12345 monitoring_type not_prometheus non_utf8_replacement_string zzz operation_key test_operation_key - partial_success false project_id test-project-id-123 require_valid_tags true source_location_key test_source_location_key span_id_key test_span_id_key split_logs_by_tag true @@ -722,33 +681,10 @@ 'location' => CUSTOM_K8S_LOCATION ) ) ).freeze - # Docker Container. - DOCKER_CONTAINER_PARAMS = { - resource: { - type: DOCKER_CONSTANTS[:resource_type], - labels: { - 'container_id' => DOCKER_CONTAINER_ID, - 'location' => ZONE - } - }, - log_name: 'test', - project_id: PROJECT_ID, - labels: { - "#{DOCKER_CONSTANTS[:service]}/stream" => DOCKER_CONTAINER_STREAM_STDOUT - } - }.freeze - DOCKER_CONTAINER_PARAMS_STREAM_STDERR = DOCKER_CONTAINER_PARAMS.merge( - labels: DOCKER_CONTAINER_PARAMS[:labels].merge( - "#{DOCKER_CONSTANTS[:service]}/stream" => DOCKER_CONTAINER_STREAM_STDERR - ) - ).freeze - DOCKER_CONTAINER_PARAMS_NO_STREAM = - DOCKER_CONTAINER_PARAMS.merge(labels: {}).freeze - # Cloud Dataflow. DATAFLOW_PARAMS = { resource: { type: DATAFLOW_CONSTANTS[:resource_type], labels: { @@ -928,27 +864,9 @@ ALL_TAGS = VALID_TAGS.merge(INVALID_TAGS) # Stub value for Monitored resources from Metadata Agent. # Map from the local_resource_id to the retrieved monitored resource. MONITORED_RESOURCE_STUBS = { - # Docker container stderr / stdout logs. - "#{DOCKER_CONTAINER_LOCAL_RESOURCE_ID_PREFIX}.#{DOCKER_CONTAINER_ID}" => - { - 'type' => DOCKER_CONSTANTS[:resource_type], - 'labels' => { - 'location' => ZONE, - 'container_id' => DOCKER_CONTAINER_ID - } - }.to_json, - # Docker container application logs. - "#{DOCKER_CONTAINER_LOCAL_RESOURCE_ID_PREFIX}.#{DOCKER_CONTAINER_NAME}" => - { - 'type' => DOCKER_CONSTANTS[:resource_type], - 'labels' => { - 'location' => ZONE, - 'container_id' => DOCKER_CONTAINER_ID - } - }.to_json, # GKE container logs. "#{CONTAINER_LOCAL_RESOURCE_ID_PREFIX}.#{CONTAINER_NAMESPACE_ID}" \ ".#{K8S_POD_NAME}.#{K8S_CONTAINER_NAME}" => { 'type' => GKE_CONSTANTS[:resource_type],