diff --git a/pillar/top.sls b/pillar/top.sls
index 9abdefd2d..ff3502304 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -3,7 +3,7 @@ base:
     - match: compound
     - common
     - environment_settings
-    # - vector
+    - vector
   # '* and not proxy-* and not restore-* and not G@roles:devstack and not P@environment:mitxonline and not G@context:packer and not P@roles:(edx|edx-worker)$':
   #   - match: compound
   #   - fluentd
@@ -15,7 +15,6 @@ base:
     - elastic_stack.version_production
   'roles:auth_server':
     - match: grain
-    - vector.cas
   'G@roles:elasticsearch and not P@environment:operations*':
     - match: compound
     - consul
@@ -82,8 +81,8 @@ base:
     - consul
     - shibboleth
     - shibboleth.odlvideo
-    - fluentd.odlvideo
     - logrotate.odlvideo
+    - vector.odlvideo
   proxy-bootcamps-*:
     - heroku.bootcamps
   proxy-mitxpro-*:
@@ -102,7 +101,7 @@ base:
     - consul
     - shibboleth
     - shibboleth.mitx_cas
-    - fluentd.cas
+    - vector.cas
   'G@roles:rabbitmq and P@environment:mitx.*':
     - match: compound
     - rabbitmq.mitx
@@ -114,8 +113,8 @@ base:
     - match: grain
     - nginx
     - nginx.reddit
-    - reddit
     - vector.reddit
+    - reddit
   'G@environment:operations and G@roles:redash':
     - match: compound
     - nginx
@@ -217,8 +216,8 @@ base:
   'roles:rabbitmq':
     - match: grain
     - rabbitmq
-    - vector.rabbitmq
     - consul.rabbitmq
+    - vector.rabbitmq
   'roles:tika':
     - match: grain
     - nginx
diff --git a/pillar/vector/cas.sls b/pillar/vector/cas.sls
index 1e06b7576..b0f309007 100644
--- a/pillar/vector/cas.sls
+++ b/pillar/vector/cas.sls
@@ -1,145 +1,10 @@
 vector:
-  extra_configurations:
-  - name: cas_logs
-    content:
-      log_schema:
-        timestamp_key: vector_timestamp
-        host_key: log_host
-      sources:
-        collect_cas_nginx_access_logs:
-          type: file
-          read_from: end
-          file_key: log_file
-          include:
-          - /var/log/nginx/access.log
-        collect_cas_nginx_error_logs:
-          type: file
-          read_from: end
-          file_key: log_file
-          include:
-          - /var/log/nginx/error.log
-        collect_cas_application_logs:
-          type: file
-          read_from: end
-          file_key: log_file
-          include:
-          - /opt/log/django.log
-          multiline:
-            start_pattern: '^\['
-            condition_pattern: '^\['
-            mode: 'halt_before'
-            timeout_ms: 5000
-        collect_auth_logs:
-        {{ salt.pillar.get('vector:base_auth_log_collection')|yaml(False)|indent(8) }}
-      transforms:
-        # Transforms for NGINX logs
-        parse_cas_nginx_access_logs:
-          type: remap
-          inputs:
-          - 'collect_cas_nginx_access_logs'
-          source: |
-            parsed, err = parse_regex(.message, r'^time=(?P<time>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{2}:\d{2})\sclient=(?P<client>[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})\smethod=(?P<method>\S*)\srequest="(?P<request>.*)"\srequest_length=(?P<request_length>\d+)\sstatus=(?P<status>\d+)\sbytes_sent=(?P<bytes_sent>\d+)\sbody_bytes_sent=(?P<body_bytes_sent>\d+)\sreferer=(?P<referer>.*)\suser_agent="(?P<user_agent>.+)"\supstream_addr=(?P<upstream_addr>.+)\supstream_status=(?P<upstream_status>.+)\srequest_time=(?P<request_time>.+)\srequest_id=(?P<request_id>\w+)\supstream_response_time=(?P<upstream_response_time>.+)\supstream_connect_time=(?P<upstream_connect_time>.+)\supstream_header_time=(?P<upstream_header_time>.*)$')
-            if err != null {
-              .parse_error = err
-            }
-            err = null
-            . = merge(., parsed)
-            .log_process = "nginx"
-            .log_type = "cas.nginx.access"
-            .environment = "${ENVIRONMENT}"
-            parsed_bs, err = to_int(.bytes_sent)
-            if err == null {
-              .bytes_sent = parsed_bs
-            }
-            err = null
-            parsed_bbs, err = to_int(.body_bytes_sent)
-            if err == null {
-              .body_bytes_sent = parsed_bbs
-            }
-            err = null
-            parsed_rl, err = to_int(.request_length)
-            if err == null {
-              .request_length = parsed_rl
-            }
-            err = null
-            parsed_rt, err = to_float(.request_time)
-            if err == null {
-              .request_time = parsed_rt
-            }
-            err = null
-            parsed_status, err = to_int(.status)
-            if err == null {
-              .status = parsed_status
-            }
-            err = null
-            parsed_usct, err = to_float(.upstream_connect_time)
-            if err == null {
-              .upstream_connect_time = parsed_usct
-            }
-            err = null
-            parsed_usht, err = to_float(.upstream_header_time)
-            if err == null {
-              .upstream_header_time = parsed_usht
-            }
-            err = null
-            parsed_uprt, err = to_float(.upstream_response_time)
-            if err == null {
-              .upstream_response_time = parsed_uprt
-            }
-            err = null
-            parsed_ups, err = to_int(.upstream_response)
-            if err == null {
-              .upstream_status = parsed_ups
-            }
-            err = null
-        filter_healthchecks_cas_nginx_access_logs:
-          inputs:
-          - 'parse_cas_nginx_access_logs'
-          type: filter
-          condition: '! contains!(.http_user_agent, "ELB-HealthChecker")'
-        parse_cas_nginx_error_logs:
-          type: remap
-          inputs:
-          - 'collect_cas_nginx_error_logs'
-          source: |
-            parsed, err = parse_regex(.message, r'^(?P<time>\d{4}/\d{2}/\d{2}\s\d{2}:\d{2}:\d{2})\s\[(?P<severity>.*)\]\s(?P<pid>\d*)#(?P<tid>\d*):\s\*(?P<cid>\d*)\s(?P<message>.*),\sclient:\s(?P<client>.*),\sserver:(?P<server>.*)(?P<additional_content>.*)$')
-            . = merge(., parsed)
-            if err != null {
-              .parse_error = err
-            }
-            .log_process = "nginx"
-            .log_type = "cas.nginx.error"
-            .environment = "${ENVIRONMENT}"
-        parse_cas_application_logs:
-          type: remap
-          inputs:
-          - 'collect_cas_application_logs'
-          source: |
-            parsed = parse_regex!(.message, r'^\[(?P<time>\d{4}-\d{2}-\d{2}\w+:\d{2}:\d{2})\] (?P<log_level>\w+) \[(?P<module_name>[a-zA-Z0-9-_.]+):(?P<line_number>\d+)\] (?P<message>.*)')
-            if err != null {
-              .parse_error = err
-            }
-            . = merge(., parsed)
-            .log_process = "cas"
-            .log_type = "cas.application"
-            .environment = "${ENVIRONMENT}"
-        enrich_cas_application_logs:
-          type: aws_ec2_metadata
-          inputs:
-          - 'parse_cas_application_logs'
-          namespace: ec2
-        parse_auth_logs:
-          {{ salt.pillar.get('vector:base_auth_log_parse_source')|yaml(False)|indent(10) }}
-      sinks:
-        ship_cas_logs_to_grafana_cloud:
-          inputs:
-          - 'filter_healthchecks_cas_nginx_access_logs'
-          - 'parse_cas_nginx_error_logs'
-          - 'enrich_cas_application_logs'
-          - 'parse_auth_logs'
-          type: loki
-          labels:
-            application: cas
-            environment: ${ENVIRONMENT}
-            service: cas
-          {{ salt.pillar.get('vector:base_loki_configuration')|yaml(False)|indent(10) }}
+  configurations: 
+  - host_metrics
+  - auth_logs
+  - nginx_logs
+  - cas_logs
+
+  config_elements:
+    application_name: 'cas'
+    service_name: 'cas'
diff --git a/pillar/vector/init.sls b/pillar/vector/init.sls
index ee24821e3..a3205cdf6 100644
--- a/pillar/vector/init.sls
+++ b/pillar/vector/init.sls
@@ -1,80 +1,17 @@
-{% set ENVIRONMENT = salt.grains.get('environment', 'dev') %}
-
 vector:
-  base_auth_log_collection:
-    type: file
-    file_key: log_file
-    read_from: end
-    include:
-    - /var/log/auth.log
-  base_auth_log_parse_source:
-    type: remap
-    inputs:
-    - 'collect_auth_logs'
-    source: |
-      parsed, err = parse_syslog(.message)
-      if err != null {
-        .parse_error = err
-      }
-      . = merge(., parsed)
-      .log_process = "authlog"
-      .environment = "${ENVIRONMENT}"
-
-  # These two are intentionally incomplete sink configurations. The type, inputs, and labels 
-  #  need to be provided on a configuration-by-configuration basis.
-  base_loki_configuration:
-    auth:
-      strategy: basic
-      password: __vault__::secret-operations/global/grafana-cloud-credentials>data>api_key
-      user: __vault__::secret-operations/global/grafana-cloud-credentials>data>loki_user
-    endpoint: https://logs-prod-us-central1.grafana.net
-    encoding:
-      codec: json
-    out_of_order_action: rewrite_timestamp
-  base_cortex_configuration:
-    endpoint: https://prometheus-prod-10-prod-us-central-0.grafana.net/api/prom/push
-    healthcheck: false
-    auth:
-      strategy: basic
-      user: __vault__::secret-operations/global/grafana-cloud-credentials>data>prometheus_user
-      password: __vault__::secret-operations/global/grafana-cloud-credentials>data>api_key
-
-  # By default, there are no extra vector configurations to add
-  extra_configurations: []
+  # This list only applies if there is not a more specific vector:configurations
+  # defined elsewhere. If there is, and you would like to include these elements as well,
+  # you will need to explicitly state them again.
+  configurations: 
+  - host_metrics
+  - auth_logs
 
-  # Call out host metrics in their own area because they will be enabled globally
-  host_metrics_configuration:
-    sources:
-      collect_host_metrics:
-        type: host_metrics
-        scrape_interval_secs: 60
-        collectors:
-          - cpu
-          - filesystem
-          - load
-          - host
-          - memory
-          - network
-    transforms:
-      cleanup_host_metrics:
-        type: remap
-        inputs:
-        - 'collect_host_metrics'
-        source: |
-          # Drop all the not-real filesystems metrics
-          abort_match_filesystem, err = !(match_any(.tags.filesystem, [r'ext.', r'btrfs', r'xfs']))
-          if abort_match_filesystem {
-            abort
-          }
-      add_labels_to_host_metrics:
-        type: remap
-        inputs:
-        - 'cleanup_host_metrics'
-        source: |
-          .tags.environment = "${ENVIRONMENT}"
-          .tags.job = "integrations/linux_host"
-    sinks:
-      ship_host_metrics_to_grafana_cloud:
-        inputs:
-        - 'add_labels_to_host_metrics'
-        {{ salt.pillar.get('vector:base_cortex_configuration')|yaml(False)|indent(8) }}
+  config_elements:
+    application_name: 'configuration_error_application_name'
+    service_name: 'configuration-error_service_name'
+    environment: {{ salt.grains.get('environment', 'configuration_error_environment') }}
+    grafana_cloud_loki_endpoint: 'https://logs-prod-us-central1.grafana.net'
+    grafana_cloud_prometheus_endpoint: 'https://prometheus-prod-10-prod-us-central-0.grafana.net/api/prom/push'
+    grafana_cloud_loki_user: __vault__::secret-operations/global/grafana-cloud-credentials>data>loki_user
+    grafana_cloud_cortex_user: __vault__::secret-operations/global/grafana-cloud-credentials>data>prometheus_user
+    grafana_cloud_password: __vault__::secret-operations/global/grafana-cloud-credentials>data>api_key
diff --git a/pillar/vector/ocw_build.sls b/pillar/vector/ocw_build.sls
index 8b37ed5cf..94740fceb 100644
--- a/pillar/vector/ocw_build.sls
+++ b/pillar/vector/ocw_build.sls
@@ -1,48 +1,9 @@
 vector:
-  configuration:
-    api:
-      enabled: true
-
-    log_schema:
-      timestamp_key: vector_timestamp
-      host_key: log_host
-
-    sources:
-      webhook_publish_log:
-        type: file
-        include:
-          - /opt/ocw/logs/webhook-publish.log
-
-    transforms:
-      webhook_publish_log_parser:
-        inputs:
-          - webhook_publish_log
-        type: remap
-        source: |
-          matches, err = parse_regex(
-            .message,
-            r'^(?P<time>\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{9}) (?P<message>.*)'
-          )
-          if matches != null {
-            .message = matches.message
-            .@timestamp = parse_timestamp!(matches.time, "%F %T%.9f")
-            .labels = ["ocw_build"]
-            .environment = "{{ salt.grains.get('environment') }}"
-          } else {
-            log(err, level: "error")
-            .malformed = true
-          }
-      webhook_publish_malformed_message_filter:
-        inputs:
-          - webhook_publish_log_parser
-        type: filter
-        condition: .malformed != true
-
-    sinks:
-      es_cluster:
-        inputs:
-          - webhook_publish_malformed_message_filter
-        type: elasticsearch
-        endpoint: 'http://operations-elasticsearch.query.consul:9200'
-        index: logstash-ocw-build-%Y.%W
-        healthcheck: false
+  configurations:
+  - host_metrics
+  - auth_logs
+  - ocw_build_logs
+
+  config_elements:
+    application_name: 'ocw_build'
+    service_name: 'ocw_builds'
diff --git a/pillar/vector/odlvideo.sls b/pillar/vector/odlvideo.sls
index f7c461953..e503145e1 100644
--- a/pillar/vector/odlvideo.sls
+++ b/pillar/vector/odlvideo.sls
@@ -1,140 +1,10 @@
 vector:
-  extra_configurations:
-  - name: odlvideo_logs
-    content:
-      log_schema:
-        timestamp_key: vector_timestamp
-        host_key: log_host
-      sources:
-        collect_odlvideo_nginx_access_logs:
-          type: file
-          read_from: end
-          file_key: log_file
-          include:
-          - /var/log/nginx/access.log
-        collect_odlvideo_nginx_error_logs:
-          type: file
-          read_from: end
-          file_key: log_file
-          include:
-          - /var/log/nginx/error.log
-        collect_odlvideo_django_logs:
-          type: file
-          read_from: end
-          file_key: log_file
-          include:
-          - /var/log/odl-video/django.log
-        collect_auth_logs:
-        {{ salt.pillar.get('vector:base_auth_log_collection')|yaml(False)|indent(8) }}
-      transforms:
-        parse_odlvideo_nginx_access_logs:
-          type: remap
-          inputs:
-          - 'collect_odlvideo_nginx_access_logs'
-          source: |
-            parsed, err = parse_regex(.message, r'^time=(?P<time>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{2}:\d{2})\sclient=(?P<client>[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})\smethod=(?P<method>\S*)\srequest="(?P<request>.*)"\srequest_length=(?P<request_length>\d+)\sstatus=(?P<status>\d+)\sbytes_sent=(?P<bytes_sent>\d+)\sbody_bytes_sent=(?P<body_bytes_sent>\d+)\sreferer=(?P<referer>.*)\suser_agent="(?P<user_agent>.+)"\supstream_addr=(?P<upstream_addr>.+)\supstream_status=(?P<upstream_status>.+)\srequest_time=(?P<request_time>.+)\srequest_id=(?P<request_id>\w+)\supstream_response_time=(?P<upstream_response_time>.+)\supstream_connect_time=(?P<upstream_connect_time>.+)\supstream_header_time=(?P<upstream_header_time>.*)$')
-            if err != null {
-              .parse_error = err
-            }
-            err = null
+  configurations: 
+  - host_metrics
+  - auth_logs
+  - nginx_logs
+  - odlvideo_logs
 
-            . = merge(., parsed)
-            .log_process = "nginx"
-            .log_type = "odl.nginx.access"
-            .environment = "${ENVIRONMENT}"
-      
-            parsed_bs, err = to_int(.bytes_sent)
-            if err == null {
-              .bytes_sent = parsed_bs
-            }
-            err = null
-            parsed_bbs, err = to_int(.body_bytes_sent)
-            if err == null {
-              .body_bytes_sent = parsed_bbs
-            }
-            err = null
-            parsed_rl, err = to_int(.request_length)
-            if err == null {
-              .request_length = parsed_rl
-            }
-            err = null
-            parsed_rt, err = to_float(.request_time)
-            if err == null {
-              .request_time = parsed_rt
-            }
-            err = null
-            parsed_status, err = to_int(.status)
-            if err == null {
-              .status = parsed_status
-            }
-            err = null
-            parsed_usct, err = to_float(.upstream_connect_time)
-            if err == null {
-              .upstream_connect_time = parsed_usct
-            }
-            err = null
-            parsed_usht, err = to_float(.upstream_header_time)
-            if err == null {
-              .upstream_header_time = parsed_usht
-            }
-            err = null
-            parsed_uprt, err = to_float(.upstream_response_time)
-            if err == null {
-              .upstream_response_time = parsed_uprt
-            }
-            err = null
-            parsed_ups, err = to_int(.upstream_response)
-            if err == null {
-              .upstream_status = parsed_ups
-            }
-            err = null
-        filter_healthchecks_odlvideo_nginx_access_logs:
-          inputs:
-          - 'parse_odlvideo_nginx_access_logs'
-          type: filter
-          condition: '! contains!(.user_agent, "ELB-HealthChecker")'
-        parse_odlvideo_nginx_error_logs:
-          type: remap
-          inputs:
-          - 'collect_odlvideo_nginx_error_logs'
-          source: |
-            parsed, err = parse_regex(.message, r'^(?P<time>\d{4}/\d{2}/\d{2}\s\d{2}:\d{2}:\d{2})\s\[(?P<severity>.*)\]\s(?P<pid>\d*)#(?P<tid>\d*):\s\*(?P<cid>\d*)\s(?P<message>.*),\sclient:\s(?P<client>.*),\sserver:(?P<server>.*)(?P<additional_content>.*)$')
-            . = merge(., parsed)
-            if err != null {
-              .parse_error = err
-            }
-            .log_process = "nginx"
-            .log_type = "odlvideo.nginx.error"
-            .environment = "${ENVIRONMENT}"
-        parse_odlvideo_django_logs:
-          type: remap
-          inputs:
-          - 'collect_odlvideo_django_logs'
-          source: |
-            event, err = parse_json(.message)
-            if event != null {
-              . = merge!(., event)
-              .log_process = "odlvideo"
-              .log_type = "odlvideo.application"
-              .environment = "${ENVIRONMENT}"
-            }
-        enrich_odlvideo_django_logs:
-          type: aws_ec2_metadata
-          inputs:
-          - 'parse_odlvideo_django_logs'
-          namespace: ec2
-        parse_auth_logs:
-          {{ salt.pillar.get('vector:base_auth_log_parse_source')|yaml(False)|indent(10) }}
-      sinks:
-        ship_odlvideo_logs_to_grafana_cloud:
-          inputs:
-          - 'enrich_odlvideo_django_logs'
-          - 'filter_healthchecks_odlvideo_nginx_access_logs'
-          - 'parse_odlvideo_nginx_error_logs'
-          - 'parse_auth_logs'
-          type: loki
-          labels:
-            environment: ${ENVIRONMENT}
-            application: odlvideo
-            service: odlvideo
-          {{ salt.pillar.get('vector:base_loki_configuration')|yaml(False)|indent(10) }}
+  config_elements:
+    application_name: 'odlvideo'
+    service_name: 'odlvideo'
diff --git a/pillar/vector/rabbitmq.sls b/pillar/vector/rabbitmq.sls
index fb1ab0f94..eaf0a5bb6 100644
--- a/pillar/vector/rabbitmq.sls
+++ b/pillar/vector/rabbitmq.sls
@@ -1,51 +1,10 @@
 vector:
-  extra_configurations:
-  - name: rabbitmq_logs
-    content:
-      log_schema:
-        timestamp_key: vector_timestamp
-        host_key: log_host
-      sources:
-        collect_rabbitmq_application_logs:
-          type: file
-          read_from: end
-          file_key: log_file
-          glob_minimum_cooldown_ms: 20000
-          include:
-          - /var/log/rabbitmq/rabbit*.log
-          multiline:
-            start_pattern: r'^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+?) \[(\w+)\]'
-            condition_pattern: r'^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+?) \[(\w+)\] (.*)$'
-            mode: 'halt_before'
-            timeout_ms: 5000
-        collect_auth_logs:
-        {{ salt.pillar.get('vector:base_auth_log_collection')|yaml(False)|indent(8) }}
-      transforms:
-        parse_rabbitmq_application_logs:
-          type: remap
-          inputs:
-          - 'collect_rabbitmq_application_logs'
-          source: |
-            parsed, err = parse_regex(.message, r'^(?P<time>\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+?) \[(?P<type>\w+)\] (?P<message>.*)$')
-            if err != null {
-              .parse_error = err
-            }
-            . = merge(., parsed)
-            .log_process = "rabbitmq"
-            .log_type = "rabbitmq.application"
-            .environment = "${ENVIRONMENT}"
+  configurations: 
+  - host_metrics
+  - auth_logs
+  - nginx_logs
+  - rabbitmq_logs
 
-        parse_auth_logs:
-          {{ salt.pillar.get('vector:base_auth_log_parse_source')|yaml(False)|indent(10) }}
-
-      sinks:
-        ship_rabbitmq_logs_to_grafana_cloud:
-          inputs:
-          - 'parse_rabbitmq_application_logs'
-          - 'parse_auth_logs'
-          labels:
-            environment: ${ENVIRONMENT}
-            application: rabbitmq
-            service: rabbitmq
-          type: loki
-          {{ salt.pillar.get('vector:base_loki_configuration')|yaml(False)|indent(10) }}
+  config_elements:
+    application_name: 'rabbitmq'
+    service_name: 'rabbitmq'
diff --git a/pillar/vector/reddit.sls b/pillar/vector/reddit.sls
index 036957979..4634c595f 100644
--- a/pillar/vector/reddit.sls
+++ b/pillar/vector/reddit.sls
@@ -1,165 +1,10 @@
 vector:
-  extra_configurations:
-  - name: reddit_logs
-    content:
-      log_schema:
-        timestamp_key: vector_timestamp
-        host_key: log_host
-      sources:
-        collect_reddit_nginx_access_logs:
-          type: file
-          read_from: end
-          file_key: log_file
-          include:
-          - /var/log/nginx/access.log
-        collect_reddit_nginx_error_logs:
-          type: file
-          read_from: end
-          file_key: log_file
-          include:
-          - /var/log/nginx/error.log
-        collect_reddit_mcrouter_logs:
-          type: file
-          read_from: end
-          file_key: log_file
-          include:
-          - /var/log/mcrouter/mcrouter.log
-        collect_reddit_application_logs:
-          type: file
-          read_from: end
-          file_key: log_file
-          include:
-          - /var/log/reddit/reddit.log
-          multiline:
-            start_pattern: '^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2},\d+'
-            condition_pattern: '^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2},\d+'
-            mode: halt_before
-            timeout_ms: 5000
-        collect_auth_logs:
-        {{ salt.pillar.get('vector:base_auth_log_collection')|yaml(False)|indent(8) }}
-      transforms:
-        # Transforms for NGINX logs
-        parse_reddit_nginx_access_logs:
-          type: remap
-          inputs:
-          - 'collect_reddit_nginx_access_logs'
-          source: |
-            parsed, err = parse_regex(.message, r'^time=(?P<time>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{2}:\d{2})\sclient=(?P<client>[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})\smethod=(?P<method>\S*)\srequest="(?P<request>.*)"\srequest_length=(?P<request_length>\d+)\sstatus=(?P<status>\d+)\sbytes_sent=(?P<bytes_sent>\d+)\sbody_bytes_sent=(?P<body_bytes_sent>\d+)\sreferer=(?P<referer>.*)\suser_agent="(?P<user_agent>.+)"\supstream_addr=(?P<upstream_addr>.+)\supstream_status=(?P<upstream_status>.+)\srequest_time=(?P<request_time>.+)\srequest_id=(?P<request_id>\w+)\supstream_response_time=(?P<upstream_response_time>.+)\supstream_connect_time=(?P<upstream_connect_time>.+)\supstream_header_time=(?P<upstream_header_time>.*)$')
-            if err != null {
-              .parse_error = err
-            }
-            err = null
-            . = merge(., parsed)
-            .log_process = "nginx"
-            .log_type = "reddit.nginx.access"
-            .environment = "${ENVIRONMENT}"
-            parsed_bs, err = to_int(.bytes_sent)
-            if err == null {
-              .bytes_sent = parsed_bs
-            }
-            err = null
-            parsed_bbs, err = to_int(.body_bytes_sent)
-            if err == null {
-              .body_bytes_sent = parsed_bbs
-            }
-            err = null
-            parsed_rl, err = to_int(.request_length)
-            if err == null {
-              .request_length = parsed_rl
-            }
-            err = null
-            parsed_rt, err = to_float(.request_time)
-            if err == null {
-              .request_time = parsed_rt
-            }
-            err = null
-            parsed_status, err = to_int(.status)
-            if err == null {
-              .status = parsed_status
-            }
-            err = null
-            parsed_usct, err = to_float(.upstream_connect_time)
-            if err == null {
-              .upstream_connect_time = parsed_usct
-            }
-            err = null
-            parsed_usht, err = to_float(.upstream_header_time)
-            if err == null {
-              .upstream_header_time = parsed_usht
-            }
-            err = null
-            parsed_uprt, err = to_float(.upstream_response_time)
-            if err == null {
-              .upstream_response_time = parsed_uprt
-            }
-            err = null
-            parsed_ups, err = to_int(.upstream_response)
-            if err == null {
-              .upstream_status = parsed_ups
-            }
-            err = null
-        filter_healthchecks_reddit_nginx_access_logs:
-          inputs:
-          - 'parse_reddit_nginx_access_logs'
-          type: filter
-          condition: '! contains!(.http_user_agent, "ELB-HealthChecker")'
-        parse_reddit_nginx_error_logs:
-          type: remap
-          inputs:
-          - 'collect_reddit_nginx_error_logs'
-          source: |
-            parsed, err = parse_regex(.message, r'^(?P<time>\d{4}/\d{2}/\d{2}\s\d{2}:\d{2}:\d{2})\s\[(?P<severity>.*)\]\s(?P<pid>\d*)#(?P<tid>\d*):\s\*(?P<cid>\d*)\s(?P<message>.*),\sclient:\s(?P<client>.*),\sserver:(?P<server>.*)(?P<additional_content>.*)$')
-            . = merge(., parsed)
-            if err != null {
-              .parse_error = err
-            }
-            .log_process = "nginx"
-            .log_type = "reddit.nginx.error"
-            .environment = "${ENVIRONMENT}"
-        parse_reddit_mcrouter_logs:
-          type: remap
-          inputs:
-          - 'collect_reddit_mcrouter_logs'
-          source: |
-            parsed, err = parse_regex(.message, r'(?P<time>\w\d{4}\s\d{2}:\d{2}:\d{2}.\d{6})\s*(?P<code_value>\d+)\s*(?P<file_name>.*):(?P<line_num>\d+)\]\s*(?P<message>.*)')
-            . = merge(., parsed)
-            if err != null {
-              .parse_error = err
-            }
-            .log_process = "mcrouter"
-            .log_type = "reddit.mcrouter"
-            .environment = "${ENVIRONMENT}"
-        parse_reddit_application_logs:
-          type: remap
-          inputs:
-          - 'collect_reddit_application_logs'
-          source: |
-            parsed, err = parse_regex(.message, r'(?P<asctime>\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2},\d{3})\s-(?P<file_name>.*)(?P<line_num>\d+)\s--\s(?P<func_name>\w+)\s(?P<level_name>\[\w+\]):(?s)(?P<message>.*)')
-            . = merge(., parsed)
-            if err != null {
-              .parse_error = err
-            }
-            .log_process = "reddit"
-            .log_type = "reddit.application"
-            .environment = "${ENVIRONMENT}"
-        enrich_reddit_application_logs:
-          type: aws_ec2_metadata
-          inputs:
-          - 'parse_reddit_application_logs'
-          namespace: ec2
-        parse_auth_logs:
-          {{ salt.pillar.get('vector:base_auth_log_parse_source')|yaml(False)|indent(10) }}
-      sinks:
-        ship_reddit_logs_to_grafana_cloud:
-          inputs:
-          - 'filter_healthchecks_reddit_nginx_access_logs'
-          - 'parse_reddit_nginx_error_logs'
-          - 'parse_reddit_mcrouter_logs'
-          - 'enrich_reddit_application_logs'
-          - 'parse_auth_logs'
-          type: loki
-          labels:
-            application: reddit
-            environment: ${ENVIRONMENT}
-            service: reddit
-          {{ salt.pillar.get('vector:base_loki_configuration')|yaml(False)|indent(10) }}
+  configurations: 
+  - host_metrics
+  - auth_logs
+  - nginx_logs
+  - reddit_logs
+
+  config_elements:
+    application_name: 'reddit'
+    service_name: 'reddit'
diff --git a/pillar/vector/xqwatcher.sls b/pillar/vector/xqwatcher.sls
index 4da724432..226a83434 100644
--- a/pillar/vector/xqwatcher.sls
+++ b/pillar/vector/xqwatcher.sls
@@ -1,115 +1,9 @@
 vector:
-  extra_configurations:
-  - name: xqueuewatcher_logs
-    content:
-      log_schema:
-        timestamp_key: vector_timestamp
-        host_key: log_host
-      sources:
-        collect_xqwatcher_application_logs:
-          type: file
-          read_from: end
-          file_key: log_file
-          glob_minimum_cooldown_ms: 20000
-          include:
-          - /edx/var/log/xqwatcher/xqwatcher.log
-          multiline:
-            start_pattern: r'^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2},\d+'
-            condition_pattern: r'^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2},\d+'
-            mode: halt_before
-            timeout_ms: 5000
-        collect_xqwatcher_stderr_logs:
-          type: file
-          read_from: end
-          file_key: log_file
-          glob_minimum_cooldown_ms: 20000
-          include:
-          - /edx/var/log/supervisor/xqwatcher-stderr.log
-          multiline:
-            start_pattern: r'^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2},\d+'
-            condition_pattern: r'^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2},\d+'
-            mode: halt_before
-            timeout_ms: 5000
-        collect_xqwatcher_supervisord_logs:
-          type: file
-          read_from: end
-          file_key: log_file
-          glob_minimum_cooldown_ms: 20000
-          include:
-          - /edx/var/log/supervisor/supervisord.log
-          multiline:
-            start_pattern: r'^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2},\d+'
-            condition_pattern: r'^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2},\d+'
-            mode: halt_before
-            timeout_ms: 5000
-        collect_auth_logs:
-        {{ salt.pillar.get('vector:base_auth_log_collection')|yaml(False)|indent(8) }}
-      transforms:
-        parse_xqwatcher_application_logs:
-          type: remap
-          inputs:
-          - 'collect_xqwatcher_application_logs'
-          source: |
-            parsed, err = parse_regex(.message, r'^(?P<time>^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2},\d+)\s-\s(?P<file_name>.*):(?P<line_number>\d+)\s--\s(?P<function_name>\w+)\s\[(?P<log_level>\w+)\]:\s(?P<message>.*)')
-            if err != null {
-              .parse_error = err
-            }
-            . = merge(., parsed)
-            .log_process = "xqwatcher"
-            .log_type = "xqwatcher.application"
-            .environment = "${ENVIRONMENT}"
-        filter_debug_xqwatcher_application_logs:
-          inputs:
-          - 'parse_xqwatcher_application_logs'
-          type: filter
-          condition: .log_level != "DEBUG"
-        parse_xqwatcher_stderr_logs:
-          type: remap
-          inputs:
-          - 'collect_xqwatcher_stderr_logs'
-          source: |
-            parsed, err = parse_regex(.message, r'^(?P<time>^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2},\d+)\s-\s(?P<file_name>.*):(?P<line_number>\d+)\s--\s(?P<function_name>\w+)\s\[(?P<log_level>\w+)\]:\s(?P<message>.*)')
-            if err != null {
-              .parse_error = err
-            }
-            . = merge(., parsed)
-            .log_process = "xqwatcher"
-            .log_type = "xqwatcher.stderr"
-            .environment = "${ENVIRONMENT}"
-        filter_debug_xqwatcher_stderr_logs:
-          inputs:
-          - 'parse_xqwatcher_stderr_logs'
-          type: filter
-          condition: .log_level != "DEBUG"
-        parse_xqwatcher_supervisord_logs:
-          type: remap
-          inputs:
-          - 'collect_xqwatcher_supervisord_logs'
-          source: |
-            parsed, err = parse_regex(.message, r'^(?P<time>^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2},\d+)\s(?P<log_level>\w+)\s(?P<message>.*)')
-            if err != null {
-              .parse_error = err
-            }
-            . = merge(., parsed)
-            .log_process = "xqwatcher"
-            .log_type = "xqwatcher.supervisord"
-            .environment = "${ENVIRONMENT}"
-        filter_debug_xqwatcher_supervisord_logs:
-          inputs:
-          - 'parse_xqwatcher_supervisord_logs'
-          type: filter
-          condition: .log_level != "DEBUG"
-        parse_auth_logs:
-          {{ salt.pillar.get('vector:base_auth_log_parse_source')|yaml(False)|indent(10) }}
-      sinks:
-        ship_xqwatcher_logs_to_grafana_cloud:
-          type: loki
-          inputs:
-          - 'filter_debug_xqwatcher_application_logs'
-          - 'filter_debug_xqwatcher_stderr_logs'
-          - 'filter_debug_xqwatcher_supervisord_logs'
-          - 'parse_auth_logs'
-          labels:
-            environment: ${ENVIRONMENT}
-            applicaiton: xqwatcher
-            service: xqwatcher
+  configurations: 
+  - host_metrics
+  - auth_logs
+  - xqwatcher_logs
+
+  config_elements:
+    application_name: 'xqwatcher'
+    service_name: 'xqwatcher'
diff --git a/salt/top.sls b/salt/top.sls
index 0a0404caf..c97a26243 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -1,7 +1,7 @@
 base:
   '*':
     - utils.install_libs
-    #- vector
+    - vector
   'P@environment:(operations|operations-qa|mitx-qa|mitx-production|mitxpro-qa|mitxpro-production|mitxonline-qa|mitxonline-production|rc-apps|production-apps|data-qa|data-production)':
     - match: compound
     - consul
@@ -58,9 +58,9 @@ base:
     - utils.file_limits
     - pgbouncer
     - reddit
+    - vector
     - nginx
     - nginx.certificates
-    - vector
   'roles:cassandra':
     - match: grain
     - cassandra
@@ -75,15 +75,16 @@ base:
     - match: compound
     - utils.configure_debian_source_repos
     - consul
-    - vector
     - python
     - node
     - nginx-shibboleth
     - django
     - uwsgi
+    - vector
   'roles:odl-video-service':
     - match: grain
     - utils.logrotate
+    - vector
   'roles:redash':
     - match: grain
     - utils.configure_debian_source_repos
diff --git a/salt/vector/configure.sls b/salt/vector/configure.sls
index 2b1c56296..be59264e9 100644
--- a/salt/vector/configure.sls
+++ b/salt/vector/configure.sls
@@ -1,3 +1,5 @@
+{% set vector_config_elements = salt.pillar.get('vector:config_elements') %}
+
 include:
   - .service
 
@@ -5,23 +7,23 @@ ensure_absence_of_default_toml_configuration:
   file.absent:
     - name: /etc/vector/vector.toml
 
-manage_vector_base_configuration:
+ensure_absence_of_legacy_vector_configuration:
+  file.absent:
+    - name: /etc/vector/vector.yaml
+
+ensure_absence_of_examples_vector_configurations:
+  file.absent:
+    - name: /etc/vector/examples
+
+{% set configs = salt.pillar.get('vector:configurations') %}
+{% for cfg in configs %}
+manage_vector_configurations_{{ cfg }}:
   file.managed:
-    - name: /etc/vector/host_metrics.yaml
-    - contents: |
-        {{ salt.pillar.get('vector:host_metrics_configuration')|yaml(False)|indent(8) }}
+    - name: /etc/vector/{{ cfg }}.yaml
+    - source: salt://vector/templates/{{ cfg }}.yaml.j2
+    - template: jinja
+    - context:
+        config_elements: {{ vector_config_elements }}
     - onchanges_in:
       - service: vector_service_running
-
-{% if salt.pillar.get('vector:extra_configurations') %}
-manage_vector_extra_configurations:
-{% set extra_configs = salt.pillar.get('vector:extra_configurations') %}
-{% for cfg in extra_configs %}
-  file.managed:
-  - name: /etc/vector/{{ cfg.name }}.yaml
-  - contents: |
-      {{ cfg.content|yaml(False)|indent(8) }}
-  - onchanges_in:
-    - service: vector_service_running
 {% endfor %}
-{% endif %}
diff --git a/salt/vector/files/vector.service b/salt/vector/files/vector.service
index f5314544e..1134f3b54 100644
--- a/salt/vector/files/vector.service
+++ b/salt/vector/files/vector.service
@@ -9,7 +9,7 @@ User=vector
 Group=vector
 # The YAML configuration file is not the default and must be specified
 # explicitly.
-ExecStart=/usr/bin/vector --config /etc/vector/vector.yaml --color=never
+ExecStart=/usr/bin/vector -C /etc/vector --color=never
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=no
 AmbientCapabilities=CAP_NET_BIND_SERVICE
diff --git a/salt/vector/templates/auth_logs.yaml.j2 b/salt/vector/templates/auth_logs.yaml.j2
new file mode 100644
index 000000000..512cfd69c
--- /dev/null
+++ b/salt/vector/templates/auth_logs.yaml.j2
@@ -0,0 +1,42 @@
+log_schema:
+  timestamp_key: vector_timestamp
+  host_key: log_host
+sources:
+  collect_auth_logs:
+    type: file
+    file_key: log_file
+    read_from: end
+    include:
+    - /var/log/auth.log
+transforms:
+  parse_auth_logs:
+    type: remap
+    inputs:
+    - 'collect_auth_logs'
+    source: |
+      parsed, err = parse_syslog(.message)
+      if err != null {
+        .parse_error = err
+      }
+      . = merge(., parsed)
+      .log_process = "authlog"
+      .log_type = "{{ config_elements.application_name }}.authlog"
+      .environment = "{{ config_elements.environment }}"
+sinks:
+  ship_auth_logs_to_grafana_cloud:
+    type: loki
+    auth:
+      password: {{ config_elements.grafana_cloud_password }}
+      strategy: basic
+      user: "{{ config_elements.grafana_cloud_loki_user }}"
+    encoding:
+      codec: json
+    endpoint: {{ config_elements.grafana_cloud_loki_endpoint }}
+    inputs:
+    - 'parse_auth_logs'
+    labels:
+      application: {{ config_elements.application_name }}
+      environment: {{ config_elements.environment }}
+      service: {{ config_elements.service_name }}
+      process: authlog 
+    out_of_order_action: rewrite_timestamp
diff --git a/salt/vector/templates/cas_logs.yaml.j2 b/salt/vector/templates/cas_logs.yaml.j2
new file mode 100644
index 000000000..6565035d3
--- /dev/null
+++ b/salt/vector/templates/cas_logs.yaml.j2
@@ -0,0 +1,52 @@
+log_schema:
+  timestamp_key: vector_timestamp
+  host_key: log_host
+sources:
+  collect_cas_application_logs:
+    type: file
+    read_from: end
+    file_key: log_file
+    include:
+    - /opt/log/django.log
+    multiline:
+      start_pattern: '^\['
+      condition_pattern: '^\['
+      mode: 'halt_before'
+      timeout_ms: 5000
+transforms:
+  parse_cas_application_logs:
+    type: remap
+    inputs:
+    - 'collect_cas_application_logs'
+    source: |
+      parsed, err = parse_regex(.message, r'^\[(?P<time>\d{4}-\d{2}-\d{2}\w+:\d{2}:\d{2})\] (?P<log_level>\w+) \[(?P<module_name>[a-zA-Z0-9-_.]+):(?P<line_number>\d+)\] (?P<message>.*)')
+      if err != null {
+        .parse_error = err
+      }
+      . = merge(., parsed)
+      .log_process = "cas"
+      .log_type = "cas.application"
+      .environment = "{{ config_elements.environment }}"
+  enrich_cas_application_logs:
+    type: aws_ec2_metadata
+    inputs:
+    - 'parse_cas_application_logs'
+    namespace: ec2
+sinks:
+  ship_cas_logs_to_grafana_cloud:
+    inputs:
+    - 'enrich_cas_application_logs'
+    type: loki
+    labels:
+      application: {{ config_elements.application_name }}
+      environment: {{ config_elements.environment }}
+      service: {{ config_elements.service_name }}
+      process: django
+    auth:
+      password: {{ config_elements.grafana_cloud_password }}
+      strategy: basic
+      user: "{{ config_elements.grafana_cloud_loki_user }}"
+    encoding:
+      codec: json
+    endpoint: "{{ config_elements.grafana_cloud_loki_endpoint }}"
+    out_of_order_action: rewrite_timestamp
diff --git a/salt/vector/templates/host_metrics.yaml.j2 b/salt/vector/templates/host_metrics.yaml.j2
new file mode 100644
index 000000000..dcc03e3af
--- /dev/null
+++ b/salt/vector/templates/host_metrics.yaml.j2
@@ -0,0 +1,41 @@
+sources:
+  collect_host_metrics:
+    type: host_metrics
+    scrape_interval_secs: 60
+    collectors:
+      - cpu
+      - filesystem
+      - load
+      - host
+      - memory
+      - network
+transforms:
+  cleanup_host_metrics:
+    type: remap
+    inputs:
+    - 'collect_host_metrics'
+    source: |
+      # Drop all the not-real filesystems metrics
+      abort_match_filesystem, err = !(match_any(.tags.filesystem, [r'ext.', r'btrfs', r'xfs']))
+      if abort_match_filesystem {
+        abort
+      }
+  add_labels_to_host_metrics:
+    type: remap
+    inputs:
+    - 'cleanup_host_metrics'
+    source: |
+      .tags.environment = "{{ config_elements.environment }}"
+      .tags.job = "integrations/linux_host"
+      .tags.application = "{{ config_elements.application_name }}"
+sinks:
+  ship_host_metrics_to_grafana_cloud:
+    inputs:
+    - 'add_labels_to_host_metrics'
+    type: prometheus_remote_write
+    endpoint: {{ config_elements.grafana_cloud_prometheus_endpoint }}
+    healthcheck: false
+    auth:
+      strategy: basic
+      user: "{{ config_elements.grafana_cloud_cortex_user }}"
+      password: {{ config_elements.grafana_cloud_password }}
diff --git a/salt/vector/templates/nginx_logs.yaml.j2 b/salt/vector/templates/nginx_logs.yaml.j2
new file mode 100644
index 000000000..9633d794b
--- /dev/null
+++ b/salt/vector/templates/nginx_logs.yaml.j2
@@ -0,0 +1,116 @@
+log_schema:
+  timestamp_key: vector_timestamp
+  host_key: log_host
+sources:
+  collect_nginx_access_logs:
+    type: file
+    read_from: end
+    file_key: log_file
+    include:
+    - /var/log/nginx/access.log
+  collect_nginx_error_logs:
+    type: file
+    read_from: end
+    file_key: log_file
+    include:
+    - /var/log/nginx/error.log
+transforms:
+  parse_nginx_access_logs:
+    type: remap
+    inputs:
+    - 'collect_nginx_access_logs'
+    source: |
+      parsed, err = parse_regex(.message, r'^time=(?P<time>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{2}:\d{2})\sclient=(?P<client>[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})\smethod=(?P<method>\S*)\srequest="(?P<request>.*)"\srequest_length=(?P<request_length>\d+)\sstatus=(?P<status>\d+)\sbytes_sent=(?P<bytes_sent>\d+)\sbody_bytes_sent=(?P<body_bytes_sent>\d+)\sreferer=(?P<referer>.*)\suser_agent="(?P<user_agent>.+)"\supstream_addr=(?P<upstream_addr>.+)\supstream_status=(?P<upstream_status>.+)\srequest_time=(?P<request_time>.+)\srequest_id=(?P<request_id>\w+)\supstream_response_time=(?P<upstream_response_time>.+)\supstream_connect_time=(?P<upstream_connect_time>.+)\supstream_header_time=(?P<upstream_header_time>.*)$')
+      if err != null {
+        .parse_error = err
+      }
+      err = null
+
+      . = merge(., parsed)
+      .log_process = "nginx"
+      .log_type = "{{ config_elements.application_name }}.nginx.access"
+      .environment = "{{ config_elements.environment }}"
+
+      parsed_bs, err = to_int(.bytes_sent)
+      if err == null {
+        .bytes_sent = parsed_bs
+      }
+      err = null
+      parsed_bbs, err = to_int(.body_bytes_sent)
+      if err == null {
+        .body_bytes_sent = parsed_bbs
+      }
+      err = null
+      parsed_rl, err = to_int(.request_length)
+      if err == null {
+        .request_length = parsed_rl
+      }
+      err = null
+      parsed_rt, err = to_float(.request_time)
+      if err == null {
+        .request_time = parsed_rt
+      }
+      err = null
+      parsed_status, err = to_int(.status)
+      if err == null {
+        .status = parsed_status
+      }
+      err = null
+      parsed_usct, err = to_float(.upstream_connect_time)
+      if err == null {
+        .upstream_connect_time = parsed_usct
+      }
+      err = null
+      parsed_usht, err = to_float(.upstream_header_time)
+      if err == null {
+        .upstream_header_time = parsed_usht
+      }
+      err = null
+      parsed_uprt, err = to_float(.upstream_response_time)
+      if err == null {
+        .upstream_response_time = parsed_uprt
+      }
+      err = null
+      parsed_ups, err = to_int(.upstream_response)
+      if err == null {
+        .upstream_status = parsed_ups
+      }
+      err = null
+  filter_healthchecks_nginx_access_logs:
+    inputs:
+    - 'parse_nginx_access_logs'
+    type: filter
+    condition: '! contains!(.user_agent, "ELB-HealthChecker")'
+  parse_nginx_error_logs:
+    type: remap
+    inputs:
+    - 'collect_nginx_error_logs'
+    source: |
+      parsed, err = parse_regex(.message, r'^(?P<time>\d{4}/\d{2}/\d{2}\s\d{2}:\d{2}:\d{2})\s\[(?P<severity>.*)\]\s(?P<pid>\d*)#(?P<tid>\d*):\s\*(?P<cid>\d*)\s(?P<message>.*),\sclient:\s(?P<client>.*),\sserver:(?P<server>.*)(?P<additional_content>.*)$')
+      . = merge(., parsed)
+      if err != null {
+        .parse_error = err
+      }
+      .log_process = "nginx"
+      .log_type = "{{ config_elements.application_name }}.nginx.error"
+      .environment = "{{ config_elements.environment }}"
+sinks:
+  ship_nginx_logs_to_grafana_cloud:
+    type: loki
+    auth: 
+      password: {{ config_elements.grafana_cloud_password }}
+      strategy: basic
+      user: "{{ config_elements.grafana_cloud_loki_user }}"
+    encoding: 
+      codec: json
+    endpoint: {{ config_elements.grafana_cloud_loki_endpoint }}
+    inputs: 
+      - filter_healthchecks_nginx_access_logs
+      - parse_nginx_error_logs
+    labels: 
+      application: {{ config_elements.application_name }}
+      environment: {{ config_elements.environment }}
+      service: {{ config_elements.service_name }}
+      process: nginx
+    out_of_order_action: rewrite_timestamp
+
diff --git a/salt/vector/templates/ocw_build_logs.yaml b/salt/vector/templates/ocw_build_logs.yaml
new file mode 100644
index 000000000..034404531
--- /dev/null
+++ b/salt/vector/templates/ocw_build_logs.yaml
@@ -0,0 +1,47 @@
+### Legacy Configuration file
+api:
+  enabled: true
+
+log_schema:
+  timestamp_key: vector_timestamp
+  host_key: log_host
+
+sources:
+  webhook_publish_log:
+    type: file
+    include:
+      - /opt/ocw/logs/webhook-publish.log
+
+transforms:
+  webhook_publish_log_parser:
+    inputs:
+      - webhook_publish_log
+    type: remap
+    source: |
+      matches, err = parse_regex(
+        .message,
+        r'^(?P<time>\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{9}) (?P<message>.*)'
+      )
+      if matches != null {
+        .message = matches.message
+        .@timestamp = parse_timestamp!(matches.time, "%F %T%.9f")
+        .labels = ["ocw_build"]
+        .environment = "{{ config_elements.environment }}"
+      } else {
+        log(err, level: "error")
+        .malformed = true
+      }
+  webhook_publish_malformed_message_filter:
+    inputs:
+      - webhook_publish_log_parser
+    type: filter
+    condition: .malformed != true
+
+sinks:
+  es_cluster:
+    inputs:
+      - webhook_publish_malformed_message_filter
+    type: elasticsearch
+    endpoint: 'http://operations-elasticsearch.query.consul:9200'
+    index: logstash-ocw-build-%Y.%W
+    healthcheck: false
diff --git a/salt/vector/templates/odlvideo_logs.yaml.j2 b/salt/vector/templates/odlvideo_logs.yaml.j2
new file mode 100644
index 000000000..0e3fb189e
--- /dev/null
+++ b/salt/vector/templates/odlvideo_logs.yaml.j2
@@ -0,0 +1,47 @@
+log_schema:
+  timestamp_key: vector_timestamp
+  host_key: log_host
+sources:
+  collect_odlvideo_django_logs:
+    type: file
+    read_from: end
+    file_key: log_file
+    include:
+    - /var/log/odl-video/django.log
+transforms:
+  parse_odlvideo_django_logs:
+    type: remap
+    inputs:
+    - 'collect_odlvideo_django_logs'
+    source: |
+      event, err = parse_json(.message)
+      if event != null {
+        . = merge!(., event)
+        .log_process = "odlvideo"
+        .log_type = "odlvideo.application"
+        .environment = "{{ config_elements.environment }}"
+      }
+  enrich_odlvideo_django_logs:
+    type: aws_ec2_metadata
+    inputs:
+    - 'parse_odlvideo_django_logs'
+    namespace: ec2
+sinks:
+  ship_odlvideo_logs_to_grafana_cloud:
+    type: loki
+    auth: 
+      password: {{ config_elements.grafana_cloud_password }}
+      strategy: basic
+      user: "{{ config_elements.grafana_cloud_loki_user }}"
+    encoding: 
+      codec: json
+    endpoint: "{{ config_elements.grafana_cloud_loki_endpoint }}"
+    inputs: 
+      - enrich_odlvideo_django_logs
+    labels: 
+      application: {{ config_elements.application_name }}
+      environment: {{ config_elements.environment }}
+      service: {{ config_elements.service_name }}
+      process: django
+    out_of_order_action: rewrite_timestamp
+
diff --git a/salt/vector/templates/rabbitmq_logs.yaml.j2 b/salt/vector/templates/rabbitmq_logs.yaml.j2
new file mode 100644
index 000000000..e9bfcc824
--- /dev/null
+++ b/salt/vector/templates/rabbitmq_logs.yaml.j2
@@ -0,0 +1,48 @@
+log_schema:
+  timestamp_key: vector_timestamp
+  host_key: log_host
+sources:
+  collect_rabbitmq_application_logs:
+    type: file
+    read_from: end
+    file_key: log_file
+    glob_minimum_cooldown_ms: 20000
+    include:
+    - /var/log/rabbitmq/rabbit*.log
+    multiline:
+      start_pattern: r'^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+?) \[(\w+)\]'
+      condition_pattern: r'^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+?) \[(\w+)\] (.*)$'
+      mode: 'halt_before'
+      timeout_ms: 5000
+transforms:
+  parse_rabbitmq_application_logs:
+    type: remap
+    inputs:
+    - 'collect_rabbitmq_application_logs'
+    source: |
+      parsed, err = parse_regex(.message, r'^(?P<time>\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+?) \[(?P<type>\w+)\] (?P<message>.*)$')
+      if err != null {
+        .parse_error = err
+      }
+      . = merge(., parsed)
+      .log_process = "rabbitmq"
+      .log_type = "rabbitmq.application"
+      .environment = "{{ config_elements.environment }}"
+sinks:
+  ship_rabbitmq_logs_to_grafana_cloud:
+    inputs:
+    - 'parse_rabbitmq_application_logs'
+    labels:
+      application: {{ config_elements.application_name }}
+      environment: {{ config_elements.environment }}
+      service: {{ config_elements.service_name }}
+      process: rabbitmq
+    type: loki
+    auth:
+      password: {{ config_elements.grafana_cloud_password }}
+      strategy: basic
+      user: "{{ config_elements.grafana_cloud_loki_user }}"
+    encoding:
+      codec: json
+    endpoint: "{{ config_elements.grafana_cloud_loki_endpoint }}"
+    out_of_order_action: rewrite_timestamp
diff --git a/salt/vector/templates/reddit_logs.yaml.j2 b/salt/vector/templates/reddit_logs.yaml.j2
new file mode 100644
index 000000000..e48ade35b
--- /dev/null
+++ b/salt/vector/templates/reddit_logs.yaml.j2
@@ -0,0 +1,71 @@
+log_schema:
+  timestamp_key: vector_timestamp
+  host_key: log_host
+sources:
+  collect_reddit_mcrouter_logs:
+    type: file
+    read_from: end
+    file_key: log_file
+    include:
+    - /var/log/mcrouter/mcrouter.log
+  collect_reddit_application_logs:
+    type: file
+    read_from: end
+    file_key: log_file
+    include:
+    - /var/log/reddit/reddit.log
+    multiline:
+      start_pattern: '^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2},\d+'
+      condition_pattern: '^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2},\d+'
+      mode: halt_before
+      timeout_ms: 5000
+transforms:
+  parse_reddit_mcrouter_logs:
+    type: remap
+    inputs:
+    - 'collect_reddit_mcrouter_logs'
+    source: |
+      parsed, err = parse_regex(.message, r'(?P<time>\w\d{4}\s\d{2}:\d{2}:\d{2}.\d{6})\s*(?P<code_value>\d+)\s*(?P<file_name>.*):(?P<line_num>\d+)\]\s*(?P<message>.*)')
+      . = merge(., parsed)
+      if err != null {
+        .parse_error = err
+      }
+      .log_process = "mcrouter"
+      .log_type = "reddit.mcrouter"
+      .environment = "{{ config_elements.environment }}"
+  parse_reddit_application_logs:
+    type: remap
+    inputs:
+    - 'collect_reddit_application_logs'
+    source: |
+      parsed, err = parse_regex(.message, r'(?P<asctime>\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2},\d{3})\s-(?P<file_name>.*)(?P<line_num>\d+)\s--\s(?P<func_name>\w+)\s(?P<level_name>\[\w+\]):(?s)(?P<message>.*)')
+      . = merge(., parsed)
+      if err != null {
+        .parse_error = err
+      }
+      .log_process = "reddit"
+      .log_type = "reddit.application"
+      .environment = "{{ config_elements.environment }}"
+  enrich_reddit_application_logs:
+    type: aws_ec2_metadata
+    inputs:
+    - 'parse_reddit_application_logs'
+    namespace: ec2
+sinks:
+  ship_reddit_logs_to_grafana_cloud:
+    inputs:
+    - 'parse_reddit_mcrouter_logs'
+    - 'enrich_reddit_application_logs'
+    labels:
+      application: {{ config_elements.application_name }}
+      environment: {{ config_elements.environment }}
+      service: {{ config_elements.service_name }}
+    type: loki
+    auth:
+      password: {{ config_elements.grafana_cloud_password }}
+      strategy: basic
+      user: "{{ config_elements.grafana_cloud_loki_user }}"
+    encoding:
+      codec: json
+    endpoint: "{{ config_elements.grafana_cloud_loki_endpoint }}"
+    out_of_order_action: rewrite_timestamp
diff --git a/salt/vector/templates/xqwatcher_logs.yaml.j2 b/salt/vector/templates/xqwatcher_logs.yaml.j2
new file mode 100644
index 000000000..beec69eca
--- /dev/null
+++ b/salt/vector/templates/xqwatcher_logs.yaml.j2
@@ -0,0 +1,114 @@
+log_schema:
+  timestamp_key: vector_timestamp
+  host_key: log_host
+sources:
+  collect_xqwatcher_application_logs:
+    type: file
+    read_from: end
+    file_key: log_file
+    glob_minimum_cooldown_ms: 20000
+    include:
+    - /edx/var/log/xqwatcher/xqwatcher.log
+    multiline:
+      start_pattern: r'^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2},\d+'
+      condition_pattern: r'^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2},\d+'
+      mode: halt_before
+      timeout_ms: 5000
+  collect_xqwatcher_stderr_logs:
+    type: file
+    read_from: end
+    file_key: log_file
+    glob_minimum_cooldown_ms: 20000
+    include:
+    - /edx/var/log/supervisor/xqwatcher-stderr.log
+    multiline:
+      start_pattern: r'^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2},\d+'
+      condition_pattern: r'^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2},\d+'
+      mode: halt_before
+      timeout_ms: 5000
+  collect_xqwatcher_supervisord_logs:
+    type: file
+    read_from: end
+    file_key: log_file
+    glob_minimum_cooldown_ms: 20000
+    include:
+    - /edx/var/log/supervisor/supervisord.log
+    multiline:
+      start_pattern: r'^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2},\d+'
+      condition_pattern: r'^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2},\d+'
+      mode: halt_before
+      timeout_ms: 5000
+transforms:
+  parse_xqwatcher_application_logs:
+    type: remap
+    inputs:
+    - 'collect_xqwatcher_application_logs'
+    source: |
+      parsed, err = parse_regex(.message, r'^(?P<time>^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2},\d+)\s-\s(?P<file_name>.*):(?P<line_number>\d+)\s--\s(?P<function_name>\w+)\s\[(?P<log_level>\w+)\]:\s(?P<message>.*)')
+      if err != null {
+        .parse_error = err
+      }
+      . = merge(., parsed)
+      .log_process = "xqwatcher"
+      .log_type = "xqwatcher.application"
+      .environment = "{{ config_elements.environment }}"
+  filter_debug_xqwatcher_application_logs:
+    inputs:
+    - 'parse_xqwatcher_application_logs'
+    type: filter
+    condition: .log_level != "DEBUG"
+  parse_xqwatcher_stderr_logs:
+    type: remap
+    inputs:
+    - 'collect_xqwatcher_stderr_logs'
+    source: |
+      parsed, err = parse_regex(.message, r'^(?P<time>^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2},\d+)\s-\s(?P<file_name>.*):(?P<line_number>\d+)\s--\s(?P<function_name>\w+)\s\[(?P<log_level>\w+)\]:\s(?P<message>.*)')
+      if err != null {
+        .parse_error = err
+      }
+      . = merge(., parsed)
+      .log_process = "xqwatcher"
+      .log_type = "xqwatcher.stderr"
+      .environment = "{{ config_elements.environment }}"
+  filter_debug_xqwatcher_stderr_logs:
+    inputs:
+    - 'parse_xqwatcher_stderr_logs'
+    type: filter
+    condition: .log_level != "DEBUG"
+  parse_xqwatcher_supervisord_logs:
+    type: remap
+    inputs:
+    - 'collect_xqwatcher_supervisord_logs'
+    source: |
+      parsed, err = parse_regex(.message, r'^(?P<time>^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2},\d+)\s(?P<log_level>\w+)\s(?P<message>.*)')
+      if err != null {
+        .parse_error = err
+      }
+      . = merge(., parsed)
+      .log_process = "xqwatcher"
+      .log_type = "xqwatcher.supervisord"
+      .environment = "{{ config_elements.environment }}"
+  filter_debug_xqwatcher_supervisord_logs:
+    inputs:
+    - 'parse_xqwatcher_supervisord_logs'
+    type: filter
+    condition: .log_level != "DEBUG"
+sinks:
+  ship_xqwatcher_logs_to_grafana_cloud:
+    type: loki
+    inputs:
+    - 'filter_debug_xqwatcher_application_logs'
+    - 'filter_debug_xqwatcher_stderr_logs'
+    - 'filter_debug_xqwatcher_supervisord_logs'
+    labels:
+      application: {{ config_elements.application_name }}
+      environment: {{ config_elements.environment }}
+      service: {{ config_elements.service_name }}
+    auth:
+      password: {{ config_elements.grafana_cloud_password }}
+      strategy: basic
+      user: "{{ config_elements.grafana_cloud_loki_user }}"
+    encoding:
+      codec: json
+    endpoint: "{{ config_elements.grafana_cloud_loki_endpoint }}"
+    out_of_order_action: rewrite_timestamp