Skip to content

Commit a7a9028

Browse files
committed
WRITING-1619: BI Connector 2.0
1 parent b60d9a9 commit a7a9028

30 files changed

+935
-860
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ DS_Store
66
meta.yaml
77
fabfile
88
giza.log
9-
source/figures/
9+
source/images

Makefile

+12-5
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,25 @@ STAGING_BUCKET=docs-mongodb-org-staging
66
PRODUCTION_BUCKET=docs-mongodb-org-prod
77
PREFIX=bi-connector
88

9-
.PHONY: help stage fake-deploy deploy
9+
.PHONY: help html publish stage fake-deploy deploy
1010

1111
help:
1212
@echo 'Targets'
13+
@echo ' html - Build HTML for this branch'
1314
@echo ' help - Show this help message'
1415
@echo ' stage - Host online for review'
1516
@echo ' fake-deploy - Create a fake deployment in the staging bucket'
1617
@echo ' deploy - Deploy to the production bucket'
17-
@echo ''
18+
@echo
1819
@echo 'Variables'
1920
@echo ' ARGS - Arguments to pass to mut-publish'
2021

22+
html:
23+
giza make html
24+
25+
publish:
26+
giza make publish
27+
2128
stage:
2229
mut-publish build/${GIT_BRANCH}/html ${STAGING_BUCKET} --prefix=${PREFIX} --stage ${ARGS}
2330
@echo "Hosted at ${STAGING_URL}/${PREFIX}/${USER}/${GIT_BRANCH}/index.html"
@@ -28,10 +35,10 @@ fake-deploy: build/public
2835

2936
deploy: build/public
3037
@echo "Doing a dry-run"
31-
mut-publish build/public ${PRODUCTION_BUCKET} --prefix=${PREFIX} --deploy --verbose --all-subdirectories --dry-run ${ARGS}
38+
mut-publish build/public ${PRODUCTION_BUCKET} --prefix=${PREFIX} --deploy --verbose --dry-run --redirect-prefix='bi-connector' ${ARGS}
3239

33-
@echo ''
40+
@echo
3441
read -p "Press any key to perform the previous"
35-
mut-publish build/public ${PRODUCTION_BUCKET} --prefix=${PREFIX} --deploy --all-subdirectories ${ARGS}
42+
mut-publish build/public ${PRODUCTION_BUCKET} --prefix=${PREFIX} --deploy --redirect-prefix='bi-connector' ${ARGS}
3643

3744
@echo "Hosted at ${PRODUCTION_URL}/${PREFIX}/index.html"

README.rst

+14-7
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,24 @@ This repository contains documentation regarding components of the
66
the MongoDB Connector for BI (Business Intelligence). This documentation
77
builds on the work of the `MongoDB Manual <http://docs.mongodb.org/manual/>`_.
88

9-
If you already have `giza <https://pypi.python.org/pypi/giza/>`_
10-
installed, you can download and build this documentation locally with
11-
the following command: ::
9+
Building
10+
--------
1211

13-
git clone git://github.com/mongodb/docs-bi-connector
14-
cd docs-bi-connector/
15-
giza make html
12+
First install `mut <https://github.com/mongodb/mut>`_.
1613

17-
View ``build/html/index.html`` to view your current build of the
14+
Then you can download and build this documentation locally with
15+
the following command:
16+
17+
git clone https://github.com/mongodb/docs-bi-connector.git
18+
cd docs-bi-connector/
19+
make build
20+
21+
View ``build/master/html/index.html`` to view your current build of the
1822
documentation.
1923

24+
Contributing
25+
------------
26+
2027
To contribute to the documentation, please fork this repository on
2128
GitHub and issue a pull request. If you have not done so already,
2229
please sign the `MongoDB/10gen Contributor Agreement

conf.py

+5-13
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#
66
# This file is execfile()d with the current directory set to its containing dir.
77

8+
import base64
89
import sys
910
import os.path
1011
import datetime
@@ -59,22 +60,13 @@
5960
extlinks = {
6061
'issue': ('https://jira.mongodb.org/browse/%s', '' ),
6162
'manual': ('http://docs.mongodb.com/manual%s', ''),
62-
63+
'v3.4': ('http://docs.mongodb.com/v3.4%s', ''),
6364
}
6465

6566
intersphinx_mapping = {}
66-
67-
try:
68-
for i in intersphinx_libs:
69-
intersphinx_mapping[i['name']] = ( i['url'], os.path.join(conf.paths.projectroot,
70-
conf.paths.output,
71-
i['path']))
72-
except:
73-
for i in intersphinx_libs:
74-
intersphinx_mapping[i.name] = ( i.url, os.path.join(conf.paths.projectroot,
75-
conf.paths.output,
76-
i.path))
77-
67+
for i in intersphinx_libs:
68+
intersphinx_mapping[i.name] = (i.url, os.path.join(conf.paths.projectroot,
69+
conf.paths.output, i.path))
7870

7971
languages = [
8072
("ar", "Arabic"),

config/build_conf.yaml

+5-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ git:
55
project:
66
name: 'bi-connector'
77
tag: 'bi-connector'
8-
url: 'http://docs.mongodb.com'
8+
url: 'https://docs.mongodb.com/bi-connector/'
99
title: "MongoDB Connector for BI"
1010
branched: true
1111
system:
@@ -27,15 +27,17 @@ system:
2727
- 'push.yaml'
2828
- 'integration.yaml'
2929
- 'sphinx_local.yaml'
30-
- images: '/source/images/metadata.yaml'
3130
- htaccess: ['htaccess.yaml']
3231
version:
3332
release: '2.0'
3433
branch: 'master'
3534
assets:
3635
- branch: master
3736
path: build/docs-tools
38-
repository: http://github.com/mongodb/docs-tools.git
37+
repository: https://github.com/mongodb/docs-tools.git
38+
- branch: bi-connector
39+
path: source/images/bi-connector
40+
repository: https://github.com/mongodb/docs-assets.git
3941
paths:
4042
output: 'build'
4143
source: 'source'

config/htaccess.yaml

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# Each YAML document has the following schema:
2+
#
3+
# from: "the path to the redirected URL"
4+
# to: "the path to the new location for the resource"
5+
# type: "currently this script only supports 'redirect', and
6+
# ignores all documents with another type."
7+
# code: "the HTTP redirect code. Raises exception if not 301, 302, 303."
8+
# outputs: "a list of branches/paths as follows:"
9+
#
10+
# - 'all': generates redirects for all published branches, but *not* 'manual'. But giza will take care of manual as part of integration.yaml logic in redirects.py
11+
#
12+
# - '<branch>': generates redirects for a specific branch.
13+
#
14+
# - 'before-<branch>': generates redirects for all branches that
15+
# reflect releases previous to the specified branch. (Inclusive.)
16+
#
17+
# - 'after-<branch>': generates redirects for all branches that
18+
# reflect releases after the specified branch. (Non-inclusive.)
19+
#
20+
# All paths are relative to the ``source/`` directory.
21+
#
22+
########################################################################
23+
24+
from: '/reference/mongobiuser'
25+
to: '/components'
26+
type: 'redirect'
27+
code: 301
28+
outputs:
29+
- 'after-v1.1': {'/bi-connector': 'https://docs.mongodb.com/bi-connector'}
30+
---
31+
from: '/reference/mongobischema'
32+
to: '/components'
33+
type: 'redirect'
34+
code: 301
35+
outputs:
36+
- 'after-v1.1': {'/bi-connector': 'https://docs.mongodb.com/bi-connector'}
37+
---
38+
from: '/reference/mongosqld'
39+
to: '/components'
40+
type: 'redirect'
41+
code: 301
42+
outputs:
43+
- 'before-v1.1': {'/bi-connector': 'https://docs.mongodb.com/bi-connector'}
44+
---
45+
code: 301
46+
from: '/'
47+
to: '/v1.1'
48+
outputs:
49+
- {'/bi-connector': 'https://docs.mongodb.com/bi-connector'}
50+
type: redirect
51+
...

config/intersphinx.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: mongodb
22
url: https://docs.mongodb.com/manual/
33
path: mongodb.inv
44
---
5-
name: python2
5+
name: python
66
url: https://docs.python.org/2/
77
path: python2.inv
88
...

source/components.txt

+13-5
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,29 @@ MongoDB Connector for BI Components
1010
:depth: 1
1111
:class: singlecol
1212

13+
.. versionchanged:: 2.0
14+
Version 2.0 of the |bi| introduces a new architecture that replaces
15+
the previous PostgreSQL foreign data wrapper with the new
16+
:program:`mongosqld`.
17+
18+
As a result, the |bi| no longer requires ``mongobiuser`` and
19+
``mongobischema``.
20+
21+
.. include:: /includes/fact-upgrade.rst
22+
1323
.. include:: /includes/fact-bi-enterprise.rst
1424

1525
The |bi| provides a suite of configuration tools.
1626

17-
- :program:`mongobiuser` can modify users in the |bi|.
1827
- :program:`mongodrdl` generates database schema information for use
1928
with the |bi|.
20-
- :program:`mongobischema` will load the resulting files
21-
into the |bi|.
29+
- :program:`mongosqld` proxies incoming queries between a MySQL client
30+
and a MongoDB server.
2231

2332
.. class:: hidden
2433

2534
.. toctree::
2635
:titlesonly:
2736

28-
/reference/mongobiuser
2937
/reference/mongodrdl
30-
/reference/mongobischema
38+
/reference/mongosqld

0 commit comments

Comments
 (0)