Skip to content

Commit 2f37f90

Browse files
committed
continue page reorg
1 parent cee710a commit 2f37f90

File tree

8 files changed

+60
-134
lines changed

8 files changed

+60
-134
lines changed

content/pages/06-devops/02-monitoring.markdown

Lines changed: 35 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -58,60 +58,74 @@ application is read-heavy, write-heavy, or subject to rapid swings in traffic.
5858

5959
## Open source monitoring projects
6060

61-
* Error Tracking
62-
* [Sentry](https://github.com/getsentry/sentry) started life as a
61+
Error Tracking
62+
63+
* [Sentry](https://github.com/getsentry/sentry) started life as a
6364
Python-only monitoring project but can now be used for any programming
6465
language.
65-
* Metrics
66-
* [statsd](https://github.com/etsy/statsd/) is a node.js network daemon that
66+
67+
Metrics
68+
69+
* [statsd](https://github.com/etsy/statsd/) is a node.js network daemon that
6770
listens for metrics and aggregates them for transfer into another service
6871
such as Graphite.
69-
* [Graphite](https://graphite.readthedocs.org/en/latest/overview.html) stores
72+
* [Graphite](https://graphite.readthedocs.org/en/latest/overview.html) stores
7073
time-series data and displays them in graphs through a Django web application.
71-
* [Sensu](http://sensuapp.org/) is an open source monitoring framework
74+
* [Sensu](http://sensuapp.org/) is an open source monitoring framework
7275
written in Ruby but applicable to any programming language web application.
73-
* [Graph Explorer](http://vimeo.github.io/graph-explorer/) by Vimeo is a
76+
* [Graph Explorer](http://vimeo.github.io/graph-explorer/) by Vimeo is a
7477
Graphite-based dashboard with added features and a slick design.
75-
* [Munin](http://munin-monitoring.org/) is a client plugin-based monitoring
78+
* [Munin](http://munin-monitoring.org/) is a client plugin-based monitoring
7679
system that sends monitoring traffic to the Munin node where the data can
7780
be analyzed and visualized. Note this project is written in Perl so Perl 5
7881
must be installed on the node collecting the data.
79-
* Real User Monitoring (RUM)
80-
* [Bucky](http://github.hubspot.com/bucky/) measures the performance of a
82+
83+
User Monitoring
84+
85+
* [Bucky](http://github.hubspot.com/bucky/) measures the performance of a
8186
web application from end user's browsers and sends that data back to the
8287
server for collection.
8388

89+
8490
## Hosted monitoring services
8591
Hosted monitoring software takes away the burden of deploying and operating
8692
the software yourself. However, hosted monitoring costs (often a significant
8793
amount of) money and take your application's data out of your hands so
8894
these services are not the right fit for every project.
8995

90-
* Error Tracking
91-
* [Rollbar](https://rollbar.com/) instruments both the server side and
96+
Error Tracking
97+
98+
* [Rollbar](https://rollbar.com/) instruments both the server side and
9299
client side to capture and report exceptions. The
93100
[pyrollbar](https://rollbar.com/docs/notifier/pyrollbar/) code library
94101
provides quick integration for Python web applications. There are also
95102
specific instructions for common [web frameworks](/web-frameworks.html)
96103
such as [Django](/django.html) and [Pyramid](/pyramid.html).
97-
* [Sentry](https://sentry.io/welcome/) is the hosted version of the open
104+
* [Sentry](https://sentry.io/welcome/) is the hosted version of the open
98105
source tool that is used to monetize and support further development.
99-
* Application Performance Monitoring (APM)
100-
* [New Relic](http://newrelic.com/) provides application and database
106+
107+
Application Performance Monitoring (APM)
108+
109+
* [New Relic](http://newrelic.com/) provides application and database
101110
monitoring as well as plug ins for capturing and analyzing data about
102111
other devleoper tools in your stack, such as [Twilio](/twilio.html).
103-
* [Opbeat](https://opbeat.com) Built for django. Opbeat combines performance
112+
* [Opbeat](https://opbeat.com) Built for django. Opbeat combines performance
104113
metrics, release tracking, and error logging into a single simple service.
105-
* Status Pages
106-
* [Status.io](http://status.io/) focuses on uptime and response metrics
114+
115+
Status Pages
116+
117+
* [Status.io](http://status.io/) focuses on uptime and response metrics
107118
transparency for web applications.
108-
* [StatusPage.io](https://www.statuspage.io/) (yes, there's both a Status and
119+
* [StatusPage.io](https://www.statuspage.io/) (yes, there's both a Status and
109120
StatusPage.io) provides easy set up status pages for monitoring application
110121
up time.
111-
* Incident Management
112-
* [PagerDuty](http://www.pagerduty.com/) alerts a designated person or group
122+
123+
Incident Management
124+
125+
* [PagerDuty](http://www.pagerduty.com/) alerts a designated person or group
113126
if there are stability, performance, or uptime issues with an application.
114127

128+
115129
## Monitoring resources
116130
* [How to Add Hosted Monitoring to Flask Web Applications](/blog/hosted-monitoring-flask-web-apps.html)
117131
and
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
title: Change Log
22
category: page
33
slug: change-log
4-
sortorder: 1201
4+
sortorder: 0700
55
toc: True
66
sidebartitle: Change Log
77
meta: The change log page explains what is new on Full Stack Python.

content/pages/meta/02-what-full-stack-means.markdown renamed to content/pages/meta/01-what-full-stack-means.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
title: What "Full Stack" Means
22
category: page
33
slug: what-full-stack-means
4-
sortorder: 1202
4+
sortorder: 0701
55
toc: False
66
sidebartitle: What Full Stack Means
77
meta: Full stack is an ambiguous term so on this Full Stack Python page I describe its meaning and usage for this site.

content/pages/meta/03-about-author.markdown renamed to content/pages/meta/02-about-author.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
title: About the Author
22
category: page
33
slug: about-author
4-
sortorder: 1203
4+
sortorder: 0702
55
toc: False
66
sidebartitle: About the Author
77
meta: Learn more about the author of Full Stack Python, Matt Makai.

content/pages/meta/04-future-directions.markdown renamed to content/pages/meta/03-future-directions.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
title: Future Directions
22
category: page
33
slug: future-directions
4-
sortorder: 1204
4+
sortorder: 0703
55
toc: False
66
sidebartitle: Future Directions
77
meta: The future directions page on Full Stack Python gives some insight into in-progress site enhancements.

content/pages/meta/05-page-statuses.markdown renamed to content/pages/meta/04-page-statuses.markdown

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
title: Page Statuses
22
category: page
33
slug: page-statuses
4-
sortorder: 1205
4+
sortorder: 0704
55
toc: False
66
sidebartitle: Page Statuses
77
meta: Many pages on Full Stack Python are a work-in-progress. This page aggregates the status of each other page.
88

99

1010
# Page Statuses
11-
There are 210 pages on Full Stack Python, not including blog posts. Many
11+
There are 205 pages on Full Stack Python, not including blog posts. Many
1212
pages are a work-in-progress. This page aggregates the status of each page
1313
on the site.
1414

@@ -100,7 +100,6 @@ kept up to date with accurate descriptions and resources.
100100
|[Bokeh](/bokeh.html) | starter |
101101
|[d3.js](d3-js.html) | starter |
102102
|[Matplotlib](matplotlib.html) | starter |
103-
|Seaborn | not yet |
104103
|Markup Languages | not yet |
105104
|[Markdown](/markdown.html) | starter |
106105
|reStructuredText | not yet |
@@ -147,11 +146,28 @@ kept up to date with accurate descriptions and resources.
147146

148147

149148
## Chapter 6: DevOps
150-
| Page | Status |
149+
|Page | Status |
151150
|------------------------------------------------------------|--------------|
152151
|[DevOps](/devops.html) | starter |
152+
|[Monitoring](/monitoring.html) | intermediate |
153+
|Graphite | not yet |
154+
|Prometheus | not yet |
155+
|Service Canary | not yet |
156+
|Hosted Monitoring Services | not yet |
157+
|[Rollbar](/rollbar.html) | starter |
158+
|Sentry | not yet |
159+
|New Relic | not yet |
160+
|Scout | not yet |
161+
|Web App Performance | not yet |
162+
|[Caching](/caching.html) | starter |
163+
|Load testing | not yet |
164+
|Scaling | not yet |
153165
|[Logging](/logging.html) | intermediate |
154166
|stdlib logging | not yet |
155167
|DTrace | not yet |
156168
|logbook | not yet |
169+
|[Web analytics](/web-analytics.html) | starter |
170+
|Google Analytics | not yet |
171+
|Piwik | not yet |
172+
|MixPanel | not yet |
157173

theme/templates/table-of-contents.html

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ <h4>3.5 <span class="sn">Data visualization</span></h4>
8282
<div class="tc"><a href="/bokeh.html">Bokeh</a></div>
8383
<div class="tc"><a href="/d3-js.html">d3.js</a></div>
8484
<div class="tc"><a href="/matplotlib.html">Matplotlib</a></div>
85-
<div class="tc sn">Seaborn</div>
8685
<h4>3.6 <span class="sn">Markup Languages</span></h4>
8786
<div class="tc"><a href="/markdown.html">Markdown</a></div>
8887
<div class="tc sn">reStructuredText</div>
@@ -148,12 +147,10 @@ <h4>4.12 <a href="/api-creation.html">API creation</a></h4>
148147
<div class="tc tds sn">Django REST Framework</div>
149148
<div class="tc tds sn">Flask-RESTful</div>
150149
<div class="tc tds sn">API Star</div>
151-
<div class="tc tds sn">Flask API</div>
152150
<h4>4.13 <a href="/api-integration.html">API integration</a></h4>
153151
<div class="tc tds"><a href="/twilio.html">Twilio</a></div>
154152
<div class="tc tds sn">Stripe</div>
155153
<div class="tc tds sn">Slack</div>
156-
<div class="tc tds sn">Google APIs</div>
157154
<h4>4.14 <a href="/web-application-security.html">Web application security</a></h4>
158155
<div class="tc tds sn">Public key infrastructure</div>
159156
<div class="tc tds sn">SQL injection</div>
@@ -179,7 +176,6 @@ <h4>5.3 <a href="/platform-as-a-service.html">Platform-as-a-Service</a></h4>
179176
<div class="tc sn">Heroku</div>
180177
<div class="tc sn">PythonAnywhere</div>
181178
<div class="tc sn">Codestar</div>
182-
<div class="tc sn">Google App Engine</div>
183179
<h4>5.4 <a href="/operating-systems.html">Operating systems</a></h4>
184180
<div class="tc"><a href="/ubuntu.html">Ubuntu Linux</a></div>
185181
<div class="tc sn">macOS</div>
@@ -202,7 +198,6 @@ <h4>5.7 <a href="/continuous-integration.html">Continuous integration</a></h4>
202198
<h4>5.8 <a href="/configuration-management.html">Configuration management</a></h4>
203199
<div class="tc"><a href="/ansible.html">Ansible</a></div>
204200
<div class="tc sn">Salt</div>
205-
<div class="tc sn">Fabric</div>
206201
<h4>5.9 <span class="sn">Containers</span></h4>
207202
<div class="tc"><a href="/docker.html">Docker</a></div>
208203
<div class="tc sn">Kubernetes</div>
@@ -220,7 +215,7 @@ <h4>6.2 <span class="sn">Hosted Monitoring Services</span></h4>
220215
<div class="tc"><a href="/rollbar.html">Rollbar</a></div>
221216
<div class="tc sn">Sentry</div>
222217
<div class="tc sn">New Relic</div>
223-
<div class="tc sn">DataDog</div>
218+
<div class="tc sn">Scout</div>
224219
<h4>6.3 <span class="sn">Web App Performance</span></h4>
225220
<div class="tc"><a href="/caching.html">Caching</a></div>
226221
<div class="tc sn">Load testing</div>

theme/templates/toc.html

Lines changed: 0 additions & 99 deletions
This file was deleted.

0 commit comments

Comments
 (0)