Merge pull request apache#3 from ayush-san/zstaging

Zstaging

airflow/config_templates/airflow-prod.cfg

@@ -286,7 +286,7 @@ error_logfile = -
 # This is only applicable for the flask-admin based web UI (non FAB-based).
 # In the FAB-based web UI with RBAC feature,
 # access to configuration is controlled by role permissions.
-expose_config = True
+expose_config = False
 
 # Set to true to turn on authentication:
 # https://airflow.apache.org/security.html#web-authentication

airflow/config_templates/airflow-staging.cfg

@@ -286,7 +286,7 @@ error_logfile = -
 # This is only applicable for the flask-admin based web UI (non FAB-based).
 # In the FAB-based web UI with RBAC feature,
 # access to configuration is controlled by role permissions.
-expose_config = False
+expose_config = True
 
 # Set to true to turn on authentication:
 # https://airflow.apache.org/security.html#web-authentication

scripts/docker/entrypoint.sh

@@ -20,6 +20,15 @@ set -e
 
 : "${AIRFLOW__CORE__FERNET_KEY:=${FERNET_KEY:=$(python -c "from cryptography.fernet import Fernet; FERNET_KEY = Fernet.generate_key().decode(); print(FERNET_KEY)")}}"
 
+export AIRFLOW__SCHEDULER__STATSD_HOST
+
+if test "$AWS_EXECUTION_ENV" = "AWS_ECS_EC2"
+then
+  instance_ip=$(curl --silent http://169.254.169.254/1.0/meta-data/local-ipv4)
+  AIRFLOW__SCHEDULER__STATSD_HOST=$instance_ip
+fi
+echo statsd host is "$AIRFLOW__SCHEDULER__STATSD_HOST"
+
 echo Starting Apache Airflow with command:
 echo airflow "$@"
 

setup.py

@@ -262,7 +262,8 @@ def write_version(filename=os.path.join(*["airflow", "git_version"])):
                  'yarn-api-client~=0.3.6',
                  'sasl~=0.2.1',
                  'overrides',
-                 'sqlparser']
+                 'sqlparser',
+                 'airflow-prometheus-exporter']
 
 all_dbs = postgres + mysql + hive + mssql + hdfs + vertica + cloudant + druid + pinot \
           + cassandra + mongo
@@ -307,7 +308,7 @@ def write_version(filename=os.path.join(*["airflow", "git_version"])):
              datadog + zendesk + jdbc + ldap + kerberos + password + webhdfs + jenkins +
              druid + pinot + segment + snowflake + elasticsearch + azure_data_lake + azure_cosmos +
              atlas + azure_container_instances + cgroups + virtualenv + flask_oauth + atlas + emr +
-             async_packages + zomato_custom)
+             async_packages + zomato_custom + statsd)
 
 # Snakebite & Google Cloud Dataflow are not Python 3 compatible :'(
 if PY3: