Merge pull request #1051 from influxdata/table-structure

Update table structure page

content/v2.0/reference/key-concepts/data-schema.md

@@ -0,0 +1,63 @@
+---
+title: InfluxDB data schema
+description: >
+  InfluxDB uses a tabular data schema for displaying raw data in Data Explorer and for returning query results in annotated CSV syntax.
+aliases:
+  - /v2.0/reference/key-concepts/table-structure
+weight: 103
+menu:
+  v2_0_ref:
+    parent: Key concepts
+    name: Data schema
+v2.0/tags: [key concepts]
+---
+
+InfluxDB [data elements](/v2.0/reference/key-concepts/data-elements/) are stored in [time-structured merge tree (TSM)](/v2.0/reference/internals/storage-engine/#time-structured-merge-tree-tsm) and [time series index (TSI)](/v2.0/reference/internals/storage-engine/#time-series-index-tsi) files to efficiently compact stored data.
+
+InfluxDB also provides a **tabular data schema** that includes the following:
+
+- [Annotation rows](#annotation-rows)
+- [Header row](#header-row)
+- [Data rows](#data-row)
+- [Data columns](#data-columns)
+- [Group keys](#group-keys)
+
+The **tabular data schema is used for the following**:
+
+- To [view raw data](/v2.0/visualize-data/explore-metrics/#view-raw-data) when [exploring metrics with InfluxDB](/v2.0/visualize-data/explore-metrics)
+- To return query results in [annotated CSV syntax](/v2.0/reference/syntax/annotated-csv/)
+
+## Annotation rows
+
+Annotation rows describe column properties, for example:
+
+- `#group`
+- `#datatype`
+- `#default`
+
+## Header row
+
+The header row defines column labels that describe data in each column, for example:
+   
+- `table`
+- `_time`
+- `_value`
+- `_field`
+- `_measurement`
+-  tag key names (without underscore prefix): `tag-1`, `tag-2`
+
+## Data rows
+
+Each data row contains the data specified in the header row for one [point](/v2.0/reference/glossary/#point).
+
+## Other columns
+
+In addition to the columns in each data row (specified in the header row), the following columns are optional:
+
+- `annotation`
+- `result`
+- `table`
+
+## Group keys
+
+Determine the contents of output tables in Flux by grouping records that share common values in specified columns. Learn more about [grouping your data with Flux](/v2.0/query-data/flux/group-data/).

content/v2.0/reference/key-concepts/table-structure.md

@@ -1,24 +0,0 @@
----
-title: InfluxDB table structure
-description: >
-  InfluxDB uses a columnar system to structure tables.
-weight: 103
-menu:
-  v2_0_ref:
-    parent: Key concepts
-    name: Table structure
-v2.0/tags: [key concepts]
----
-
-InfluxDB 2.0 uses the following columnar table structure to store data:
-
-- **Annotation rows:** include the following rows: #group, #datatype, and #default.
-- **Header row:** describes the data labels for each column in a row.
-- **Data columns:** include the following columns: annotation, result, and table.
-- **Data rows:** all rows that contain time series data. For details about the type of data stored in InfluxDB, see [InfluxDB data elements](/v2.0/reference/key-concepts/data-elements/).
-- **Group keys** determine the contents of output tables in Flux by grouping records that share common values in specified columns. Learn more about [grouping your data with Flux](/v2.0/query-data/flux/group-data/).
-
-For specifications on the InfluxDB 2.0 table structure, see [Tables](/v2.0/reference/syntax/annotated-csv/#tables).
-
-**_Tip:_** To visualize your table structure in the InfluxDB user interface, click the **Data Explorer** icon
-in the sidebar, create a query, click **Submit**, and then select **View Raw Data**.