diff --git a/doc/admin-guide-cloud/telemetry/section_telemetry-data-collection.xml b/doc/admin-guide-cloud/telemetry/section_telemetry-data-collection.xml
index 60092c0830..f27e253588 100644
--- a/doc/admin-guide-cloud/telemetry/section_telemetry-data-collection.xml
+++ b/doc/admin-guide-cloud/telemetry/section_telemetry-data-collection.xml
@@ -490,16 +490,17 @@
       <xref linkend="section_telemetry-publishers"/>.</para>
     <section xml:id="section_telemetry-pipeline-configuration">
       <title>Pipeline configuration</title>
-      <para>Pipeline configuration by default, is stored in a separate configuration
-        file, called <filename>pipeline.yaml</filename>, next to the
-        <filename>ceilometer.conf</filename> file. The pipeline
-        configuration file can be set in the <option>pipeline_cfg_file</option>
-        parameter listed in the <link xlink:href=
+      <para>Pipeline configuration by default, is stored in separate configuration
+        files, called <filename>pipeline.yaml</filename> and
+        <filename>event_pipeline.yaml</filename>, next to the
+        <filename>ceilometer.conf</filename> file. The meter pipeline and event pipeline
+        configuration files can be set by the <option>pipeline_cfg_file</option>
+        and <option>event_pipeline_cfg_file</option> parameters listed in the <link xlink:href=
         "http://docs.openstack.org/juno/config-reference/content/ch_configuring-openstack-telemetry.html"
         >Description of configuration options for api table</link> section in the
-        <citetitle>OpenStack Configuration Reference</citetitle>. Multiple chains
+        <citetitle>OpenStack Configuration Reference</citetitle> respectively. Multiple pipelines
         can be defined in one pipeline configuration file.</para>
-      <para>The chain definition looks like the following:</para>
+      <para>The meter pipeline definition looks like the following:</para>
       <programlisting>---
 sources:
   - name: 'source name'
@@ -610,9 +611,22 @@ sinks:
           <td>unit_conversion</td>
         </tr>
       </tbody>
-    </table>
+      </table>
       <para>The publishers section contains the list of publishers, where the samples data should
         be sent after the possible transformations.</para>
+      <para>Similarly, the event pipeline definition looks like the following:</para>
+      <programlisting>---
+sources:
+  - name: 'source name'
+    events:
+      - 'event filter'
+    sinks
+      - 'sink name'
+sinks:
+  - name: 'sink name'
+    publishers:
+      - 'list of publishers'</programlisting>
+      <para>The event filter uses the same filtering logic as the meter pipeline.</para>
       <section xml:id="section_telemetry-pipeline-transformers">
         <title>Transformers</title>
         <para>The definition of transformers can contain the following fields:</para>
diff --git a/doc/config-reference/telemetry/section_telemetry-sample-configuration-files.xml b/doc/config-reference/telemetry/section_telemetry-sample-configuration-files.xml
index 6f0358cf2d..7f39662bb6 100644
--- a/doc/config-reference/telemetry/section_telemetry-sample-configuration-files.xml
+++ b/doc/config-reference/telemetry/section_telemetry-sample-configuration-files.xml
@@ -36,7 +36,15 @@
           samples generated by the Telemetry module</para>
         <programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/ceilometer/plain/etc/ceilometer/pipeline.yaml?h=stable/juno"/></programlisting>
     </section>
-    <!-- TODO(gordc): add event_pipeline.yaml for kilo -->
+    <section xml:id="section_event_pipeline.yaml">
+        <title>event_pipeline.yaml</title>
+        <para>Event pipelines describe a coupling between notification event_types
+            and the corresponding sinks for publication of the event data. They are
+            defined in the <filename>event_pipeline.yaml</filename> file.</para>
+        <para>This file can be modified to adjust which notifications to capture and the
+          and where to publish the events.</para>
+        <programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/ceilometer/plain/etc/ceilometer/event_pipeline.yaml"/></programlisting>
+    </section>
     <section xml:id="section_ceilometer-policy.json">
         <title>policy.json</title>
         <para>The <filename>policy.json</filename> file defines additional